Merge branch 'main' into refactor/storage

# Conflicts:
#	src-tauri/src/database.rs
#	src/components/DeepLinkImportDialog.tsx
#	src/components/skills/SkillsPage.tsx
#	src/i18n/locales/en.json
#	src/i18n/locales/zh.json

scripts/filter-icons.js

@@ -14,6 +14,7 @@ const KEEP_LIST = [
     'zhipu', 'chatglm', 'glm', 'minimax', 'mistral', 'cohere',
     'perplexity', 'huggingface', 'midjourney', 'stability',
     'xai', 'grok', 'yi', 'zeroone', 'ollama',
+    'packycode',
 
     // Cloud/Tools
     'aws', 'googlecloud', 'huawei', 'cloudflare',

scripts/generate-icon-index.js

@@ -24,6 +24,7 @@ const KNOWN_METADATA = {
   microsoft: { name: 'microsoft', displayName: 'Microsoft', category: 'ai-provider', keywords: ['copilot', 'azure'], defaultColor: '#00A4EF' },
   cohere: { name: 'cohere', displayName: 'Cohere', category: 'ai-provider', keywords: ['cohere'], defaultColor: '#39594D' },
   perplexity: { name: 'perplexity', displayName: 'Perplexity', category: 'ai-provider', keywords: ['perplexity'], defaultColor: '#20808D' },
+  packycode: { name: 'packycode', displayName: 'PackyCode', category: 'ai-provider', keywords: ['packycode', 'packy', 'packyapi'], defaultColor: 'currentColor' },
   mistral: { name: 'mistral', displayName: 'Mistral', category: 'ai-provider', keywords: ['mistral'], defaultColor: '#FF7000' },
   huggingface: { name: 'huggingface', displayName: 'Hugging Face', category: 'ai-provider', keywords: ['huggingface', 'hf'], defaultColor: '#FFD21E' },
   aws: { name: 'aws', displayName: 'AWS', category: 'cloud', keywords: ['amazon', 'cloud'], defaultColor: '#FF9900' },

src-tauri/Cargo.toml

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

src-tauri/src/app_config.rs

@@ -494,8 +494,11 @@ impl MultiAppConfig {
         // 创建提示词对象
         let timestamp = std::time::SystemTime::now()
             .duration_since(std::time::UNIX_EPOCH)
-            .unwrap()
+            .map(|d| d.as_secs() as i64)
-            .as_secs() as i64;
+            .unwrap_or_else(|_| {
+                log::warn!("Failed to get system time, using 0 as timestamp");
+                0
+            });
 
         let id = format!("auto-imported-{timestamp}");
         let prompt = crate::prompt::Prompt {

src-tauri/src/commands/deeplink.rs

@@ -1,4 +1,7 @@
-use crate::deeplink::{import_provider_from_deeplink, parse_deeplink_url, DeepLinkImportRequest};
+use crate::deeplink::{
+    import_mcp_from_deeplink, import_prompt_from_deeplink, import_provider_from_deeplink,
+    import_skill_from_deeplink, parse_deeplink_url, DeepLinkImportRequest,
+};
 use crate::store::AppState;
 use tauri::State;
 
@@ -15,18 +18,18 @@ pub fn parse_deeplink(url: String) -> Result<DeepLinkImportRequest, String> {
 pub fn merge_deeplink_config(
     request: DeepLinkImportRequest,
 ) -> Result<DeepLinkImportRequest, String> {
-    log::info!("Merging config for deep link request: {}", request.name);
+    log::info!("Merging config for deep link request: {:?}", request.name);
     crate::deeplink::parse_and_merge_config(&request).map_err(|e| e.to_string())
 }
 
-/// Import a provider from a deep link request (after user confirmation)
+/// Import a provider from a deep link request (legacy, kept for compatibility)
 #[tauri::command]
 pub fn import_from_deeplink(
     state: State<AppState>,
     request: DeepLinkImportRequest,
 ) -> Result<String, String> {
     log::info!(
-        "Importing provider from deep link: {} for app {}",
+        "Importing provider from deep link: {:?} for app {:?}",
         request.name,
         request.app
     );
@@ -37,3 +40,50 @@ pub fn import_from_deeplink(
 
     Ok(provider_id)
 }
+
+/// Import resource from a deep link request (unified handler)
+#[tauri::command]
+pub async fn import_from_deeplink_unified(
+    state: State<'_, AppState>,
+    request: DeepLinkImportRequest,
+) -> Result<serde_json::Value, String> {
+    log::info!("Importing {} resource from deep link", request.resource);
+
+    match request.resource.as_str() {
+        "provider" => {
+            let provider_id =
+                import_provider_from_deeplink(&state, request).map_err(|e| e.to_string())?;
+            Ok(serde_json::json!({
+                "type": "provider",
+                "id": provider_id
+            }))
+        }
+        "prompt" => {
+            let prompt_id =
+                import_prompt_from_deeplink(&state, request).map_err(|e| e.to_string())?;
+            Ok(serde_json::json!({
+                "type": "prompt",
+                "id": prompt_id
+            }))
+        }
+        "mcp" => {
+            let result = import_mcp_from_deeplink(&state, request).map_err(|e| e.to_string())?;
+            // Add type field to the result
+            Ok(serde_json::json!({
+                "type": "mcp",
+                "importedCount": result.imported_count,
+                "importedIds": result.imported_ids,
+                "failed": result.failed
+            }))
+        }
+        "skill" => {
+            let skill_key =
+                import_skill_from_deeplink(&state, request).map_err(|e| e.to_string())?;
+            Ok(serde_json::json!({
+                "type": "skill",
+                "key": skill_key
+            }))
+        }
+        _ => Err(format!("Unsupported resource type: {}", request.resource)),
+    }
+}

src-tauri/src/commands/import_export.rs

@@ -6,20 +6,22 @@ use tauri::State;
 use tauri_plugin_dialog::DialogExt;
 
 use crate::error::AppError;
-use crate::services::ConfigService;
+use crate::services::provider::ProviderService;
 use crate::store::AppState;
 
-/// 导出配置文件
+/// 导出数据库为 SQL 备份
 #[tauri::command]
 pub async fn export_config_to_file(
     #[allow(non_snake_case)] filePath: String,
+    state: State<'_, AppState>,
 ) -> Result<Value, String> {
+    let db = state.db.clone();
     tauri::async_runtime::spawn_blocking(move || {
         let target_path = PathBuf::from(&filePath);
-        ConfigService::export_config_to_path(&target_path)?;
+        db.export_sql(&target_path)?;
         Ok::<_, AppError>(json!({
             "success": true,
-            "message": "Configuration exported successfully",
+            "message": "SQL exported successfully",
             "filePath": filePath
         }))
     })
@@ -28,65 +30,49 @@ pub async fn export_config_to_file(
     .map_err(|e: AppError| e.to_string())
 }
 
-/// 从文件导入配置
+/// 从 SQL 备份导入数据库
-/// TODO: 需要重构以使用数据库而不是 JSON 配置
 #[tauri::command]
 pub async fn import_config_from_file(
-    #[allow(non_snake_case)] _filePath: String,
+    #[allow(non_snake_case)] filePath: String,
-    _state: State<'_, AppState>,
+    state: State<'_, AppState>,
 ) -> Result<Value, String> {
-    // TODO: 实现基于数据库的导入逻辑
+    let db = state.db.clone();
-    // 当前暂时禁用此功能
+    let db_for_state = db.clone();
-    Err("配置导入功能正在重构中,暂时不可用".to_string())
+    tauri::async_runtime::spawn_blocking(move || {
-
-    /* 旧的实现,需要重构:
-    let (new_config, backup_id) = tauri::async_runtime::spawn_blocking(move || {
         let path_buf = PathBuf::from(&filePath);
-        ConfigService::load_config_for_import(&path_buf)
+        let backup_id = db.import_sql(&path_buf)?;
+
+        // 导入后同步当前供应商到各自的 live 配置
+        let app_state = AppState::new(db_for_state);
+        if let Err(err) = ProviderService::sync_current_from_db(&app_state) {
+            log::warn!("导入后同步 live 配置失败: {err}");
+        }
+
+        Ok::<_, AppError>(json!({
+            "success": true,
+            "message": "SQL imported successfully",
+            "backupId": backup_id
+        }))
     })
     .await
     .map_err(|e| format!("导入配置失败: {e}"))?
-    .map_err(|e: AppError| e.to_string())?;
+    .map_err(|e: AppError| e.to_string())
-
-    {
-        let mut guard = state
-            .config
-            .write()
-            .map_err(|e| AppError::from(e).to_string())?;
-        *guard = new_config;
-    }
-
-    Ok(json!({
-        "success": true,
-        "message": "Configuration imported successfully",
-        "backupId": backup_id
-    }))
-    */
 }
 
-/// 同步当前供应商配置到对应的 live 文件
-/// 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: 实现基于数据库的同步逻辑
+    let db = state.db.clone();
-    // 当前暂时禁用此功能
+    tauri::async_runtime::spawn_blocking(move || {
-    Err("配置同步功能正在重构中,暂时不可用".to_string())
+        let app_state = AppState::new(db);
-
+        ProviderService::sync_current_from_db(&app_state)?;
-    /* 旧的实现,需要重构:
+        Ok::<_, AppError>(json!({
-    {
+            "success": true,
-        let mut config_state = state
+            "message": "Live configuration synchronized"
-            .config
+        }))
-            .write()
+    })
-            .map_err(|e| AppError::from(e).to_string())?;
+    .await
-        ConfigService::sync_current_providers_to_live(&mut config_state)
+    .map_err(|e| format!("同步当前供应商失败: {e}"))?
-            .map_err(|e| e.to_string())?;
+    .map_err(|e: AppError| e.to_string())
-    }
-
-    Ok(json!({
-        "success": true,
-        "message": "Live configuration synchronized"
-    }))
-    */
 }
 
 /// 保存文件对话框
@@ -98,7 +84,7 @@ pub async fn save_file_dialog<R: tauri::Runtime>(
     let dialog = app.dialog();
     let result = dialog
         .file()
-        .add_filter("JSON", &["json"])
+        .add_filter("SQL", &["sql"])
         .set_file_name(&defaultName)
         .blocking_save_file();
 
@@ -113,7 +99,7 @@ pub async fn open_file_dialog<R: tauri::Runtime>(
     let dialog = app.dialog();
     let result = dialog
         .file()
-        .add_filter("JSON", &["json"])
+        .add_filter("SQL", &["sql"])
         .blocking_pick_file();
 
     Ok(result.map(|p| p.to_string()))

src-tauri/src/commands/skill.rs

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

src-tauri/src/database.rs

@@ -4,10 +4,34 @@ use crate::error::AppError;
 use crate::prompt::Prompt;
 use crate::provider::{Provider, ProviderMeta};
 use crate::services::skill::{SkillRepo, SkillState};
+use chrono::Utc;
 use indexmap::IndexMap;
-use rusqlite::{params, Connection, Result};
+use rusqlite::backup::Backup;
+use rusqlite::types::ValueRef;
+use rusqlite::{params, Connection};
+use serde::Serialize;
 use std::collections::HashMap;
+use std::fs;
+use std::path::{Path, PathBuf};
 use std::sync::Mutex;
+use tempfile::NamedTempFile;
+
+/// 安全地序列化 JSON，避免 unwrap panic
+fn to_json_string<T: Serialize>(value: &T) -> Result<String, AppError> {
+    serde_json::to_string(value)
+        .map_err(|e| AppError::Config(format!("JSON serialization failed: {e}")))
+}
+
+/// 安全地获取 Mutex 锁，避免 unwrap panic
+macro_rules! lock_conn {
+    ($mutex:expr) => {
+        $mutex
+            .lock()
+            .map_err(|e| AppError::Database(format!("Mutex lock failed: {}", e)))?
+    };
+}
+
+const DB_BACKUP_RETAIN: usize = 10;
 
 pub struct Database {
     // 使用 Mutex 包装 Connection 以支持在多线程环境（如 Tauri State）中共享
@@ -39,9 +63,28 @@ impl Database {
         Ok(db)
     }
 
-    fn create_tables(&self) -> Result<(), AppError> {
+    /// 创建内存数据库（用于测试）
-        let conn = self.conn.lock().unwrap();
+    pub fn memory() -> Result<Self, AppError> {
+        let conn = Connection::open_in_memory().map_err(|e| AppError::Database(e.to_string()))?;
 
+        // 启用外键约束
+        conn.execute("PRAGMA foreign_keys = ON;", [])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let db = Self {
+            conn: Mutex::new(conn),
+        };
+        db.create_tables()?;
+
+        Ok(db)
+    }
+
+    fn create_tables(&self) -> Result<(), AppError> {
+        let conn = lock_conn!(self.conn);
+        Self::create_tables_on_conn(&conn)
+    }
+
+    fn create_tables_on_conn(conn: &Connection) -> Result<(), AppError> {
         // 1. Providers 表
         conn.execute(
             "CREATE TABLE IF NOT EXISTS providers (
@@ -150,9 +193,311 @@ impl Database {
         Ok(())
     }
 
+    /// 创建内存快照以避免长时间持有数据库锁
+    fn snapshot_to_memory(&self) -> Result<Connection, AppError> {
+        let conn = lock_conn!(self.conn);
+        let mut snapshot =
+            Connection::open_in_memory().map_err(|e| AppError::Database(e.to_string()))?;
+
+        {
+            let backup =
+                Backup::new(&conn, &mut snapshot).map_err(|e| AppError::Database(e.to_string()))?;
+            backup
+                .step(-1)
+                .map_err(|e| AppError::Database(e.to_string()))?;
+        }
+
+        Ok(snapshot)
+    }
+
+    /// 导出为 SQLite 兼容的 SQL 文本
+    pub fn export_sql(&self, target_path: &Path) -> Result<(), AppError> {
+        let snapshot = self.snapshot_to_memory()?;
+        let dump = Self::dump_sql(&snapshot)?;
+
+        if let Some(parent) = target_path.parent() {
+            fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?;
+        }
+
+        crate::config::atomic_write(target_path, dump.as_bytes())
+    }
+
+    /// 从 SQL 文件导入，返回生成的备份 ID（若无备份则为空字符串）
+    pub fn import_sql(&self, source_path: &Path) -> Result<String, AppError> {
+        if !source_path.exists() {
+            return Err(AppError::InvalidInput(format!(
+                "SQL 文件不存在: {}",
+                source_path.display()
+            )));
+        }
+
+        let sql_raw = fs::read_to_string(source_path).map_err(|e| AppError::io(source_path, e))?;
+        let sql_content = Self::sanitize_import_sql(&sql_raw);
+
+        // 导入前备份现有数据库
+        let backup_path = self.backup_database_file()?;
+
+        // 在临时数据库执行导入，确保失败不会污染主库
+        let temp_file = NamedTempFile::new().map_err(|e| AppError::IoContext {
+            context: "创建临时数据库文件失败".to_string(),
+            source: e,
+        })?;
+        let temp_path = temp_file.path().to_path_buf();
+        let temp_conn =
+            Connection::open(&temp_path).map_err(|e| AppError::Database(e.to_string()))?;
+
+        temp_conn
+            .execute_batch(&sql_content)
+            .map_err(|e| AppError::Database(format!("执行 SQL 导入失败: {e}")))?;
+
+        // 补齐缺失表/索引并进行基础校验
+        Self::create_tables_on_conn(&temp_conn)?;
+        Self::validate_basic_state(&temp_conn)?;
+
+        // 使用 Backup 将临时库原子写回主库
+        {
+            let mut main_conn = lock_conn!(self.conn);
+            let backup = Backup::new(&temp_conn, &mut main_conn)
+                .map_err(|e| AppError::Database(e.to_string()))?;
+            backup
+                .step(-1)
+                .map_err(|e| AppError::Database(e.to_string()))?;
+        }
+
+        let backup_id = backup_path
+            .and_then(|p| p.file_stem().map(|s| s.to_string_lossy().to_string()))
+            .unwrap_or_default();
+
+        Ok(backup_id)
+    }
+
+    /// 移除 SQLite 保留对象相关语句（如 sqlite_sequence），避免导入报错
+    fn sanitize_import_sql(sql: &str) -> String {
+        let mut cleaned = String::new();
+        let lower_keyword = "sqlite_sequence";
+
+        for stmt in sql.split(';') {
+            let trimmed = stmt.trim();
+            if trimmed.is_empty() {
+                continue;
+            }
+
+            if trimmed.to_ascii_lowercase().contains(lower_keyword) {
+                continue;
+            }
+
+            cleaned.push_str(trimmed);
+            cleaned.push_str(";\n");
+        }
+
+        cleaned
+    }
+
+    /// 生成一致性快照备份，返回备份文件路径（不存在主库时返回 None）
+    fn backup_database_file(&self) -> Result<Option<PathBuf>, AppError> {
+        let db_path = get_app_config_dir().join("cc-switch.db");
+        if !db_path.exists() {
+            return Ok(None);
+        }
+
+        let backup_dir = db_path
+            .parent()
+            .ok_or_else(|| AppError::Config("无效的数据库路径".to_string()))?
+            .join("backups");
+
+        fs::create_dir_all(&backup_dir).map_err(|e| AppError::io(&backup_dir, e))?;
+
+        let backup_id = format!("db_backup_{}", Utc::now().format("%Y%m%d_%H%M%S"));
+        let backup_path = backup_dir.join(format!("{backup_id}.db"));
+
+        {
+            let conn = lock_conn!(self.conn);
+            let mut dest_conn =
+                Connection::open(&backup_path).map_err(|e| AppError::Database(e.to_string()))?;
+            let backup = Backup::new(&conn, &mut dest_conn)
+                .map_err(|e| AppError::Database(e.to_string()))?;
+            backup
+                .step(-1)
+                .map_err(|e| AppError::Database(e.to_string()))?;
+        }
+
+        Self::cleanup_db_backups(&backup_dir)?;
+        Ok(Some(backup_path))
+    }
+
+    fn cleanup_db_backups(dir: &Path) -> Result<(), AppError> {
+        let entries = match fs::read_dir(dir) {
+            Ok(iter) => iter
+                .filter_map(|entry| entry.ok())
+                .filter(|entry| {
+                    entry
+                        .path()
+                        .extension()
+                        .map(|ext| ext == "db")
+                        .unwrap_or(false)
+                })
+                .collect::<Vec<_>>(),
+            Err(_) => return Ok(()),
+        };
+
+        if entries.len() <= DB_BACKUP_RETAIN {
+            return Ok(());
+        }
+
+        let remove_count = entries.len().saturating_sub(DB_BACKUP_RETAIN);
+        let mut sorted = entries;
+        sorted.sort_by_key(|entry| entry.metadata().and_then(|m| m.modified()).ok());
+
+        for entry in sorted.into_iter().take(remove_count) {
+            if let Err(err) = fs::remove_file(entry.path()) {
+                log::warn!("删除旧数据库备份失败 {}: {}", entry.path().display(), err);
+            }
+        }
+        Ok(())
+    }
+
+    fn validate_basic_state(conn: &Connection) -> Result<(), AppError> {
+        let provider_count: i64 = conn
+            .query_row("SELECT COUNT(*) FROM providers", [], |row| row.get(0))
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        let mcp_count: i64 = conn
+            .query_row("SELECT COUNT(*) FROM mcp_servers", [], |row| row.get(0))
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        if provider_count == 0 && mcp_count == 0 {
+            return Err(AppError::Config(
+                "导入的 SQL 未包含有效的供应商或 MCP 数据".to_string(),
+            ));
+        }
+        Ok(())
+    }
+
+    fn dump_sql(conn: &Connection) -> Result<String, AppError> {
+        let mut output = String::new();
+        let timestamp = Utc::now().format("%Y-%m-%d %H:%M:%S").to_string();
+        let user_version: i64 = conn
+            .query_row("PRAGMA user_version;", [], |row| row.get(0))
+            .unwrap_or(0);
+
+        output.push_str(&format!(
+            "-- CC Switch SQLite 导出\n-- 生成时间: {timestamp}\n-- user_version: {user_version}\n"
+        ));
+        output.push_str("PRAGMA foreign_keys=OFF;\n");
+        output.push_str(&format!("PRAGMA user_version={user_version};\n"));
+        output.push_str("BEGIN TRANSACTION;\n");
+
+        // 导出 schema
+        let mut stmt = conn
+            .prepare(
+                "SELECT type, name, tbl_name, sql
+                 FROM sqlite_master
+                 WHERE sql NOT NULL AND type IN ('table','index','trigger','view')
+                 ORDER BY type='table' DESC, name",
+            )
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut tables = Vec::new();
+        let mut rows = stmt
+            .query([])
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        while let Some(row) = rows.next().map_err(|e| AppError::Database(e.to_string()))? {
+            let obj_type: String = row.get(0).map_err(|e| AppError::Database(e.to_string()))?;
+            let name: String = row.get(1).map_err(|e| AppError::Database(e.to_string()))?;
+            let sql: String = row.get(3).map_err(|e| AppError::Database(e.to_string()))?;
+
+            // 跳过 SQLite 内部对象（如 sqlite_sequence）
+            if name.starts_with("sqlite_") {
+                continue;
+            }
+
+            output.push_str(&sql);
+            output.push_str(";\n");
+
+            if obj_type == "table" && !name.starts_with("sqlite_") {
+                tables.push(name);
+            }
+        }
+
+        // 导出数据
+        for table in tables {
+            let columns = Self::get_table_columns(conn, &table)?;
+            if columns.is_empty() {
+                continue;
+            }
+
+            let mut stmt = conn
+                .prepare(&format!("SELECT * FROM \"{table}\""))
+                .map_err(|e| AppError::Database(e.to_string()))?;
+            let mut rows = stmt
+                .query([])
+                .map_err(|e| AppError::Database(e.to_string()))?;
+
+            while let Some(row) = rows.next().map_err(|e| AppError::Database(e.to_string()))? {
+                let mut values = Vec::with_capacity(columns.len());
+                for idx in 0..columns.len() {
+                    let value = row
+                        .get_ref(idx)
+                        .map_err(|e| AppError::Database(e.to_string()))?;
+                    values.push(Self::format_sql_value(value)?);
+                }
+
+                let cols = columns
+                    .iter()
+                    .map(|c| format!("\"{c}\""))
+                    .collect::<Vec<_>>()
+                    .join(", ");
+                output.push_str(&format!(
+                    "INSERT INTO \"{table}\" ({cols}) VALUES ({});\n",
+                    values.join(", ")
+                ));
+            }
+        }
+
+        output.push_str("COMMIT;\nPRAGMA foreign_keys=ON;\n");
+        Ok(output)
+    }
+
+    fn get_table_columns(conn: &Connection, table: &str) -> Result<Vec<String>, AppError> {
+        let mut stmt = conn
+            .prepare(&format!("PRAGMA table_info(\"{table}\")"))
+            .map_err(|e| AppError::Database(e.to_string()))?;
+        let iter = stmt
+            .query_map([], |row| row.get::<_, String>(1))
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        let mut columns = Vec::new();
+        for col in iter {
+            columns.push(col.map_err(|e| AppError::Database(e.to_string()))?);
+        }
+        Ok(columns)
+    }
+
+    fn format_sql_value(value: ValueRef<'_>) -> Result<String, AppError> {
+        match value {
+            ValueRef::Null => Ok("NULL".to_string()),
+            ValueRef::Integer(i) => Ok(i.to_string()),
+            ValueRef::Real(f) => Ok(f.to_string()),
+            ValueRef::Text(t) => {
+                let text = std::str::from_utf8(t)
+                    .map_err(|e| AppError::Database(format!("文本字段不是有效的 UTF-8: {e}")))?;
+                let escaped = text.replace('\'', "''");
+                Ok(format!("'{escaped}'"))
+            }
+            ValueRef::Blob(bytes) => {
+                let mut s = String::from("X'");
+                for b in bytes {
+                    use std::fmt::Write;
+                    let _ = write!(&mut s, "{b:02X}");
+                }
+                s.push('\'');
+                Ok(s)
+            }
+        }
+    }
+
     /// 从 MultiAppConfig 迁移数据
     pub fn migrate_from_json(&self, config: &MultiAppConfig) -> Result<(), AppError> {
-        let mut conn = self.conn.lock().unwrap();
+        let mut conn = lock_conn!(self.conn);
         let tx = conn
             .transaction()
             .map_err(|e| AppError::Database(e.to_string()))?;
@@ -178,7 +523,7 @@ impl Database {
                         id,
                         app_type,
                         provider.name,
-                        serde_json::to_string(&provider.settings_config).unwrap(),
+                        to_json_string(&provider.settings_config)?,
                         provider.website_url,
                         provider.category,
                         provider.created_at,
@@ -186,7 +531,7 @@ impl Database {
                         provider.notes,
                         provider.icon,
                         provider.icon_color,
-                        serde_json::to_string(&meta_clone).unwrap(), // 不含 endpoints 的 meta
+                        to_json_string(&meta_clone)?, // 不含 endpoints 的 meta
                         is_current,
                     ],
                 )
@@ -215,11 +560,11 @@ impl Database {
                     params![
                         id,
                         server.name,
-                        serde_json::to_string(&server.server).unwrap(),
+                        to_json_string(&server.server)?,
                         server.description,
                         server.homepage,
                         server.docs,
-                        serde_json::to_string(&server.tags).unwrap(),
+                        to_json_string(&server.tags)?,
                         server.apps.claude,
                         server.apps.codex,
                         server.apps.gemini,
@@ -303,13 +648,42 @@ impl Database {
         Ok(())
     }
 
+    /// 检查数据库是否为空（需要首次导入）
+    /// 通过检查是否有任何 MCP 服务器、提示词、Skills 仓库或供应商来判断
+    pub fn is_empty_for_first_import(&self) -> Result<bool, AppError> {
+        let conn = lock_conn!(self.conn);
+
+        // 检查是否有 MCP 服务器
+        let mcp_count: i64 = conn
+            .query_row("SELECT COUNT(*) FROM mcp_servers", [], |row| row.get(0))
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 检查是否有提示词
+        let prompt_count: i64 = conn
+            .query_row("SELECT COUNT(*) FROM prompts", [], |row| row.get(0))
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 检查是否有 Skills 仓库
+        let skill_repo_count: i64 = conn
+            .query_row("SELECT COUNT(*) FROM skill_repos", [], |row| row.get(0))
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 检查是否有供应商
+        let provider_count: i64 = conn
+            .query_row("SELECT COUNT(*) FROM providers", [], |row| row.get(0))
+            .map_err(|e| AppError::Database(e.to_string()))?;
+
+        // 如果四者都为 0，说明是空数据库
+        Ok(mcp_count == 0 && prompt_count == 0 && skill_repo_count == 0 && provider_count == 0)
+    }
+
     // --- Providers DAO ---
 
     pub fn get_all_providers(
         &self,
         app_type: &str,
     ) -> Result<IndexMap<String, Provider>, AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         let mut stmt = conn.prepare(
             "SELECT id, name, settings_config, website_url, category, created_at, sort_index, notes, icon, icon_color, meta
              FROM providers WHERE app_type = ?1
@@ -396,7 +770,7 @@ impl Database {
     }
 
     pub fn get_current_provider(&self, app_type: &str) -> Result<Option<String>, AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         let mut stmt = conn
             .prepare("SELECT id FROM providers WHERE app_type = ?1 AND is_current = 1 LIMIT 1")
             .map_err(|e| AppError::Database(e.to_string()))?;
@@ -415,7 +789,7 @@ impl Database {
     }
 
     pub fn save_provider(&self, app_type: &str, provider: &Provider) -> Result<(), AppError> {
-        let mut conn = self.conn.lock().unwrap();
+        let mut conn = lock_conn!(self.conn);
         let tx = conn
             .transaction()
             .map_err(|e| AppError::Database(e.to_string()))?;
@@ -477,7 +851,7 @@ impl Database {
     }
 
     pub fn delete_provider(&self, app_type: &str, id: &str) -> Result<(), AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         conn.execute(
             "DELETE FROM providers WHERE id = ?1 AND app_type = ?2",
             params![id, app_type],
@@ -487,7 +861,7 @@ impl Database {
     }
 
     pub fn set_current_provider(&self, app_type: &str, id: &str) -> Result<(), AppError> {
-        let mut conn = self.conn.lock().unwrap();
+        let mut conn = lock_conn!(self.conn);
         let tx = conn
             .transaction()
             .map_err(|e| AppError::Database(e.to_string()))?;
@@ -516,7 +890,7 @@ impl Database {
         provider_id: &str,
         url: &str,
     ) -> Result<(), AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         let added_at = chrono::Utc::now().timestamp_millis();
         conn.execute(
             "INSERT INTO provider_endpoints (provider_id, app_type, url, added_at) VALUES (?1, ?2, ?3, ?4)",
@@ -531,7 +905,7 @@ impl Database {
         provider_id: &str,
         url: &str,
     ) -> Result<(), AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         conn.execute(
             "DELETE FROM provider_endpoints WHERE provider_id = ?1 AND app_type = ?2 AND url = ?3",
             params![provider_id, app_type, url],
@@ -543,7 +917,7 @@ impl Database {
     // --- MCP Servers DAO ---
 
     pub fn get_all_mcp_servers(&self) -> Result<IndexMap<String, McpServer>, AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         let mut stmt = conn.prepare(
             "SELECT id, name, server_config, description, homepage, docs, tags, enabled_claude, enabled_codex, enabled_gemini
              FROM mcp_servers
@@ -595,7 +969,7 @@ impl Database {
     }
 
     pub fn save_mcp_server(&self, server: &McpServer) -> Result<(), AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         conn.execute(
             "INSERT OR REPLACE INTO mcp_servers (
                 id, name, server_config, description, homepage, docs, tags,
@@ -619,7 +993,7 @@ impl Database {
     }
 
     pub fn delete_mcp_server(&self, id: &str) -> Result<(), AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         conn.execute("DELETE FROM mcp_servers WHERE id = ?1", params![id])
             .map_err(|e| AppError::Database(e.to_string()))?;
         Ok(())
@@ -628,7 +1002,7 @@ impl Database {
     // --- Prompts DAO ---
 
     pub fn get_prompts(&self, app_type: &str) -> Result<IndexMap<String, Prompt>, AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         let mut stmt = conn
             .prepare(
                 "SELECT id, name, content, description, enabled, created_at, updated_at
@@ -671,7 +1045,7 @@ impl Database {
     }
 
     pub fn save_prompt(&self, app_type: &str, prompt: &Prompt) -> Result<(), AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         conn.execute(
             "INSERT OR REPLACE INTO prompts (
                 id, app_type, name, content, description, enabled, created_at, updated_at
@@ -692,7 +1066,7 @@ impl Database {
     }
 
     pub fn delete_prompt(&self, app_type: &str, id: &str) -> Result<(), AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         conn.execute(
             "DELETE FROM prompts WHERE id = ?1 AND app_type = ?2",
             params![id, app_type],
@@ -704,7 +1078,7 @@ impl Database {
     // --- Skills DAO ---
 
     pub fn get_skills(&self) -> Result<IndexMap<String, SkillState>, AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         let mut stmt = conn
             .prepare("SELECT key, installed, installed_at FROM skills ORDER BY key ASC")
             .map_err(|e| AppError::Database(e.to_string()))?;
@@ -737,7 +1111,7 @@ impl Database {
     }
 
     pub fn update_skill_state(&self, key: &str, state: &SkillState) -> Result<(), AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         conn.execute(
             "INSERT OR REPLACE INTO skills (key, installed, installed_at) VALUES (?1, ?2, ?3)",
             params![key, state.installed, state.installed_at.timestamp()],
@@ -747,7 +1121,7 @@ impl Database {
     }
 
     pub fn get_skill_repos(&self) -> Result<Vec<SkillRepo>, AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         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()))?;
@@ -772,7 +1146,7 @@ impl Database {
     }
 
     pub fn save_skill_repo(&self, repo: &SkillRepo) -> Result<(), AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         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],
@@ -781,7 +1155,7 @@ impl Database {
     }
 
     pub fn delete_skill_repo(&self, owner: &str, name: &str) -> Result<(), AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         conn.execute(
             "DELETE FROM skill_repos WHERE owner = ?1 AND name = ?2",
             params![owner, name],
@@ -790,10 +1164,31 @@ impl Database {
         Ok(())
     }
 
+    /// 初始化默认的 Skill 仓库（首次启动时调用）
+    pub fn init_default_skill_repos(&self) -> Result<usize, AppError> {
+        // 检查是否已有仓库
+        let existing = self.get_skill_repos()?;
+        if !existing.is_empty() {
+            return Ok(0);
+        }
+
+        // 获取默认仓库列表
+        let default_store = crate::services::skill::SkillStore::default();
+        let mut count = 0;
+
+        for repo in &default_store.repos {
+            self.save_skill_repo(repo)?;
+            count += 1;
+        }
+
+        log::info!("初始化默认 Skill 仓库完成，共 {count} 个");
+        Ok(count)
+    }
+
     // --- Settings DAO ---
 
     pub fn get_setting(&self, key: &str) -> Result<Option<String>, AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         let mut stmt = conn
             .prepare("SELECT value FROM settings WHERE key = ?1")
             .map_err(|e| AppError::Database(e.to_string()))?;
@@ -812,7 +1207,7 @@ impl Database {
     }
 
     pub fn set_setting(&self, key: &str, value: &str) -> Result<(), AppError> {
-        let conn = self.conn.lock().unwrap();
+        let conn = lock_conn!(self.conn);
         conn.execute(
             "INSERT OR REPLACE INTO settings (key, value) VALUES (?1, ?2)",
             params![key, value],
@@ -837,7 +1232,7 @@ impl Database {
             self.set_setting(&key, &value)
         } else {
             // Delete if None
-            let conn = self.conn.lock().unwrap();
+            let conn = lock_conn!(self.conn);
             conn.execute("DELETE FROM settings WHERE key = ?1", params![key])
                 .map_err(|e| AppError::Database(e.to_string()))?;
             Ok(())

src-tauri/src/lib.rs

@@ -26,6 +26,7 @@ pub use app_config::{AppType, McpApps, McpServer, MultiAppConfig};
 pub use codex_config::{get_codex_auth_path, get_codex_config_path, write_codex_live_atomic};
 pub use commands::*;
 pub use config::{get_claude_mcp_path, get_claude_settings_path, read_json_file};
+pub use database::Database;
 pub use deeplink::{import_provider_from_deeplink, parse_deeplink_url, DeepLinkImportRequest};
 pub use error::AppError;
 pub use mcp::{
@@ -314,7 +315,7 @@ fn handle_deeplink_url(
     match crate::deeplink::parse_deeplink_url(url_str) {
         Ok(request) => {
             log::info!(
-                "✓ Successfully parsed deep link: resource={}, app={}, name={}",
+                "✓ Successfully parsed deep link: resource={}, app={:?}, name={:?}",
                 request.resource,
                 request.app,
                 request.name
@@ -495,24 +496,31 @@ pub fn run() {
                     use objc2::runtime::AnyObject;
                     use objc2_app_kit::NSColor;
 
-                    let ns_window_ptr = window.ns_window().unwrap();
+                    match window.ns_window() {
-                    let ns_window: Retained<AnyObject> =
+                        Ok(ns_window_ptr) => {
-                        unsafe { Retained::retain(ns_window_ptr as *mut AnyObject).unwrap() };
+                            if let Some(ns_window) =
+                                unsafe { Retained::retain(ns_window_ptr as *mut AnyObject) }
+                            {
+                                // 使用与主界面 banner 相同的蓝色 #3498db
+                                // #3498db = RGB(52, 152, 219)
+                                let bg_color = unsafe {
+                                    NSColor::colorWithRed_green_blue_alpha(
+                                        52.0 / 255.0,  // R: 52
+                                        152.0 / 255.0, // G: 152
+                                        219.0 / 255.0, // B: 219
+                                        1.0,           // Alpha: 1.0
+                                    )
+                                };
 
-                    // 使用与主界面 banner 相同的蓝色 #3498db
+                                unsafe {
-                    // #3498db = RGB(52, 152, 219)
+                                    use objc2::msg_send;
-                    let bg_color = unsafe {
+                                    let _: () = msg_send![&*ns_window, setBackgroundColor: &*bg_color];
-                        NSColor::colorWithRed_green_blue_alpha(
+                                }
-                            52.0 / 255.0,  // R: 52
+                            } else {
-                            152.0 / 255.0, // G: 152
+                                log::warn!("Failed to retain NSWindow reference");
-                            219.0 / 255.0, // B: 219
+                            }
-                            1.0,           // Alpha: 1.0
+                        }
-                        )
+                        Err(e) => log::warn!("Failed to get NSWindow pointer: {e}"),
-                    };
-
-                    unsafe {
-                        use objc2::msg_send;
-                        let _: () = msg_send![&*ns_window, setBackgroundColor: &*bg_color];
                     }
                 }
             }
@@ -563,8 +571,118 @@ pub fn run() {
                 }
             }
 
+            crate::settings::bind_db(db.clone());
             let app_state = AppState::new(db);
 
+            // 检查是否需要首次导入（数据库为空）
+            let need_first_import = app_state
+                .db
+                .is_empty_for_first_import()
+                .unwrap_or_else(|e| {
+                    log::warn!("Failed to check if database is empty: {e}");
+                    false
+                });
+
+            if need_first_import {
+                // 数据库为空，尝试从用户现有的配置文件导入数据并初始化默认配置
+                log::info!(
+                    "Empty database detected, importing existing configurations and initializing defaults..."
+                );
+
+                // 1. 初始化默认 Skills 仓库（3个）
+                match app_state.db.init_default_skill_repos() {
+                    Ok(count) if count > 0 => {
+                        log::info!("✓ Initialized {count} default skill repositories");
+                    }
+                    Ok(_) => log::debug!("No default skill repositories to initialize"),
+                    Err(e) => log::warn!("✗ Failed to initialize default skill repos: {e}"),
+                }
+
+                // 2. 导入供应商配置（从 live 配置文件）
+                for app in [
+                    crate::app_config::AppType::Claude,
+                    crate::app_config::AppType::Codex,
+                    crate::app_config::AppType::Gemini,
+                ] {
+                    match crate::services::provider::ProviderService::import_default_config(
+                        &app_state,
+                        app.clone(),
+                    ) {
+                        Ok(_) => {
+                            log::info!("✓ Imported default provider for {}", app.as_str());
+                        }
+                        Err(e) => {
+                            log::debug!(
+                                "○ No default provider to import for {}: {}",
+                                app.as_str(),
+                                e
+                            );
+                        }
+                    }
+                }
+
+                // 3. 导入 MCP 服务器配置
+                match crate::services::mcp::McpService::import_from_claude(&app_state) {
+                    Ok(count) if count > 0 => {
+                        log::info!("✓ Imported {count} MCP server(s) from Claude");
+                    }
+                    Ok(_) => log::debug!("○ No Claude MCP servers found to import"),
+                    Err(e) => log::warn!("✗ Failed to import Claude MCP: {e}"),
+                }
+
+                match crate::services::mcp::McpService::import_from_codex(&app_state) {
+                    Ok(count) if count > 0 => {
+                        log::info!("✓ Imported {count} MCP server(s) from Codex");
+                    }
+                    Ok(_) => log::debug!("○ No Codex MCP servers found to import"),
+                    Err(e) => log::warn!("✗ Failed to import Codex MCP: {e}"),
+                }
+
+                match crate::services::mcp::McpService::import_from_gemini(&app_state) {
+                    Ok(count) if count > 0 => {
+                        log::info!("✓ Imported {count} MCP server(s) from Gemini");
+                    }
+                    Ok(_) => log::debug!("○ No Gemini MCP servers found to import"),
+                    Err(e) => log::warn!("✗ Failed to import Gemini MCP: {e}"),
+                }
+
+                // 4. 导入提示词文件
+                match crate::services::prompt::PromptService::import_from_file_on_first_launch(
+                    &app_state,
+                    crate::app_config::AppType::Claude,
+                ) {
+                    Ok(count) if count > 0 => {
+                        log::info!("✓ Imported {count} prompt(s) from Claude");
+                    }
+                    Ok(_) => log::debug!("○ No Claude prompt file found to import"),
+                    Err(e) => log::warn!("✗ Failed to import Claude prompt: {e}"),
+                }
+
+                match crate::services::prompt::PromptService::import_from_file_on_first_launch(
+                    &app_state,
+                    crate::app_config::AppType::Codex,
+                ) {
+                    Ok(count) if count > 0 => {
+                        log::info!("✓ Imported {count} prompt(s) from Codex");
+                    }
+                    Ok(_) => log::debug!("○ No Codex prompt file found to import"),
+                    Err(e) => log::warn!("✗ Failed to import Codex prompt: {e}"),
+                }
+
+                match crate::services::prompt::PromptService::import_from_file_on_first_launch(
+                    &app_state,
+                    crate::app_config::AppType::Gemini,
+                ) {
+                    Ok(count) if count > 0 => {
+                        log::info!("✓ Imported {count} prompt(s) from Gemini");
+                    }
+                    Ok(_) => log::debug!("○ No Gemini prompt file found to import"),
+                    Err(e) => log::warn!("✗ Failed to import Gemini prompt: {e}"),
+                }
+
+                log::info!("First-time import completed");
+            }
+
             // 迁移旧的 app_config_dir 配置到 Store
             if let Err(e) = app_store::migrate_app_config_dir_from_settings(app.handle()) {
                 log::warn!("迁移 app_config_dir 失败: {e}");
@@ -622,7 +740,11 @@ pub fn run() {
                 .show_menu_on_left_click(true);
 
             // 统一使用应用默认图标；待托盘模板图标就绪后再启用
-            tray_builder = tray_builder.icon(app.default_window_icon().unwrap().clone());
+            if let Some(icon) = app.default_window_icon() {
+                tray_builder = tray_builder.icon(icon.clone());
+            } else {
+                log::warn!("Failed to get default window icon for tray");
+            }
 
             let _tray = tray_builder.build(app)?;
             // 将同一个实例注入到全局状态，避免重复创建导致的不一致
@@ -719,6 +841,7 @@ pub fn run() {
             commands::parse_deeplink,
             commands::merge_deeplink_config,
             commands::import_from_deeplink,
+            commands::import_from_deeplink_unified,
             update_tray_menu,
             // Environment variable management
             commands::check_env_conflicts,
@@ -768,7 +891,7 @@ pub fn run() {
                             match crate::deeplink::parse_deeplink_url(&url_str) {
                                 Ok(request) => {
                                     log::info!(
-                                        "Successfully parsed deep link from RunEvent::Opened: resource={}, app={}",
+                                        "Successfully parsed deep link from RunEvent::Opened: resource={}, app={:?}",
                                         request.resource,
                                         request.app
                                     );

src-tauri/src/mcp.rs

@@ -348,10 +348,7 @@ pub fn import_from_claude(config: &mut MultiAppConfig) -> Result<usize, AppError
     };
 
     // 确保新结构存在
-    if config.mcp.servers.is_none() {
+    let servers = config.mcp.servers.get_or_insert_with(HashMap::new);
-        config.mcp.servers = Some(HashMap::new());
-    }
-    let servers = config.mcp.servers.as_mut().unwrap();
 
     let mut changed = 0;
     let mut errors = Vec::new();
@@ -421,10 +418,7 @@ pub fn import_from_codex(config: &mut MultiAppConfig) -> Result<usize, AppError>
         .map_err(|e| AppError::McpValidation(format!("解析 ~/.codex/config.toml 失败: {e}")))?;
 
     // 确保新结构存在
-    if config.mcp.servers.is_none() {
+    let servers = config.mcp.servers.get_or_insert_with(HashMap::new);
-        config.mcp.servers = Some(HashMap::new());
-    }
-    let servers = config.mcp.servers.as_mut().unwrap();
 
     let mut changed_total = 0usize;
 
@@ -724,10 +718,7 @@ pub fn import_from_gemini(config: &mut MultiAppConfig) -> Result<usize, AppError
     };
 
     // 确保新结构存在
-    if config.mcp.servers.is_none() {
+    let servers = config.mcp.servers.get_or_insert_with(HashMap::new);
-        config.mcp.servers = Some(HashMap::new());
-    }
-    let servers = config.mcp.servers.as_mut().unwrap();
 
     let mut changed = 0;
     let mut errors = Vec::new();
@@ -852,8 +843,22 @@ fn json_value_to_toml_item(value: &Value, field_name: &str) -> Option<toml_edit:
             for item in arr {
                 match item {
                     Value::String(s) => toml_arr.push(s.as_str()),
-                    Value::Number(n) if n.is_i64() => toml_arr.push(n.as_i64().unwrap()),
+                    Value::Number(n) if n.is_i64() => {
-                    Value::Number(n) if n.is_f64() => toml_arr.push(n.as_f64().unwrap()),
+                        if let Some(i) = n.as_i64() {
+                            toml_arr.push(i);
+                        } else {
+                            all_same_type = false;
+                            break;
+                        }
+                    }
+                    Value::Number(n) if n.is_f64() => {
+                        if let Some(f) = n.as_f64() {
+                            toml_arr.push(f);
+                        } else {
+                            all_same_type = false;
+                            break;
+                        }
+                    }
                     Value::Bool(b) => toml_arr.push(*b),
                     _ => {
                         all_same_type = false;

src-tauri/src/services/mcp.rs

@@ -180,21 +180,68 @@ impl McpService {
     }
 
     /// 从 Claude 导入 MCP（v3.7.0 已更新为统一结构）
-    pub fn import_from_claude(_state: &AppState) -> Result<usize, AppError> {
+    pub fn import_from_claude(state: &AppState) -> Result<usize, AppError> {
-        // TODO: Implement import logic using database
+        // 创建临时 MultiAppConfig 用于导入
-        // For now, return 0 as a placeholder
+        let mut temp_config = crate::app_config::MultiAppConfig::default();
-        Ok(0)
+
+        // 调用原有的导入逻辑（从 mcp.rs）
+        let count = crate::mcp::import_from_claude(&mut temp_config)?;
+
+        // 如果有导入的服务器，保存到数据库
+        if count > 0 {
+            if let Some(servers) = &temp_config.mcp.servers {
+                for server in servers.values() {
+                    state.db.save_mcp_server(server)?;
+                    // 同步到 Claude live 配置
+                    Self::sync_server_to_apps(state, server)?;
+                }
+            }
+        }
+
+        Ok(count)
     }
 
     /// 从 Codex 导入 MCP（v3.7.0 已更新为统一结构）
-    pub fn import_from_codex(_state: &AppState) -> Result<usize, AppError> {
+    pub fn import_from_codex(state: &AppState) -> Result<usize, AppError> {
-        // TODO: Implement import logic using database
+        // 创建临时 MultiAppConfig 用于导入
-        Ok(0)
+        let mut temp_config = crate::app_config::MultiAppConfig::default();
+
+        // 调用原有的导入逻辑（从 mcp.rs）
+        let count = crate::mcp::import_from_codex(&mut temp_config)?;
+
+        // 如果有导入的服务器，保存到数据库
+        if count > 0 {
+            if let Some(servers) = &temp_config.mcp.servers {
+                for server in servers.values() {
+                    state.db.save_mcp_server(server)?;
+                    // 同步到 Codex live 配置
+                    Self::sync_server_to_apps(state, server)?;
+                }
+            }
+        }
+
+        Ok(count)
     }
 
     /// 从 Gemini 导入 MCP（v3.7.0 已更新为统一结构）
-    pub fn import_from_gemini(_state: &AppState) -> Result<usize, AppError> {
+    pub fn import_from_gemini(state: &AppState) -> Result<usize, AppError> {
-        // TODO: Implement import logic using database
+        // 创建临时 MultiAppConfig 用于导入
-        Ok(0)
+        let mut temp_config = crate::app_config::MultiAppConfig::default();
+
+        // 调用原有的导入逻辑（从 mcp.rs）
+        let count = crate::mcp::import_from_gemini(&mut temp_config)?;
+
+        // 如果有导入的服务器，保存到数据库
+        if count > 0 {
+            if let Some(servers) = &temp_config.mcp.servers {
+                for server in servers.values() {
+                    state.db.save_mcp_server(server)?;
+                    // 同步到 Gemini live 配置
+                    Self::sync_server_to_apps(state, server)?;
+                }
+            }
+        }
+
+        Ok(count)
     }
 }

src-tauri/src/services/prompt.rs

@@ -7,6 +7,14 @@ use crate::prompt::Prompt;
 use crate::prompt_files::prompt_file_path;
 use crate::store::AppState;
 
+/// 安全地获取当前 Unix 时间戳
+fn get_unix_timestamp() -> Result<i64, AppError> {
+    std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .map(|d| d.as_secs() as i64)
+        .map_err(|e| AppError::Message(format!("Failed to get system time: {e}")))
+}
+
 pub struct PromptService;
 
 impl PromptService {
@@ -64,10 +72,7 @@ impl PromptService {
                         .find(|(_, p)| p.enabled)
                         .map(|(id, p)| (id.clone(), p))
                     {
-                        let timestamp = std::time::SystemTime::now()
+                        let timestamp = get_unix_timestamp()?;
-                            .duration_since(std::time::UNIX_EPOCH)
-                            .unwrap()
-                            .as_secs() as i64;
                         enabled_prompt.content = live_content.clone();
                         enabled_prompt.updated_at = Some(timestamp);
                         log::info!("回填 live 提示词内容到已启用项: {enabled_id}");
@@ -135,10 +140,7 @@ impl PromptService {
 
         let content =
             std::fs::read_to_string(&file_path).map_err(|e| AppError::io(&file_path, e))?;
-        let timestamp = std::time::SystemTime::now()
+        let timestamp = get_unix_timestamp()?;
-            .duration_since(std::time::UNIX_EPOCH)
-            .unwrap()
-            .as_secs() as i64;
 
         let id = format!("imported-{timestamp}");
         let prompt = Prompt {
@@ -167,4 +169,56 @@ impl PromptService {
             std::fs::read_to_string(&file_path).map_err(|e| AppError::io(&file_path, e))?;
         Ok(Some(content))
     }
+
+    /// 首次启动时从现有提示词文件自动导入（如果存在）
+    /// 返回导入的数量
+    pub fn import_from_file_on_first_launch(
+        state: &AppState,
+        app: AppType,
+    ) -> Result<usize, AppError> {
+        let file_path = prompt_file_path(&app)?;
+
+        // 检查文件是否存在
+        if !file_path.exists() {
+            return Ok(0);
+        }
+
+        // 读取文件内容
+        let content = match std::fs::read_to_string(&file_path) {
+            Ok(c) => c,
+            Err(e) => {
+                log::warn!("读取提示词文件失败: {file_path:?}, 错误: {e}");
+                return Ok(0);
+            }
+        };
+
+        // 检查内容是否为空
+        if content.trim().is_empty() {
+            return Ok(0);
+        }
+
+        log::info!("发现提示词文件，自动导入: {file_path:?}");
+
+        // 创建提示词对象
+        let timestamp = get_unix_timestamp()?;
+        let id = format!("auto-imported-{timestamp}");
+        let prompt = Prompt {
+            id: id.clone(),
+            name: format!(
+                "Auto-imported Prompt {}",
+                chrono::Local::now().format("%Y-%m-%d %H:%M")
+            ),
+            content,
+            description: Some("Automatically imported on first launch".to_string()),
+            enabled: true, // 首次导入时自动启用
+            created_at: Some(timestamp),
+            updated_at: Some(timestamp),
+        };
+
+        // 保存到数据库
+        state.db.save_prompt(app.as_str(), &prompt)?;
+
+        log::info!("自动导入完成: {}", app.as_str());
+        Ok(1)
+    }
 }

src-tauri/src/services/provider.rs

@@ -12,6 +12,7 @@ use crate::config::{
 };
 use crate::error::AppError;
 use crate::provider::{Provider, UsageData, UsageResult};
+use crate::services::mcp::McpService;
 use crate::settings::{self, CustomEndpoint};
 use crate::store::AppState;
 use crate::usage_script;
@@ -424,9 +425,9 @@ impl ProviderService {
     /// 归一化 Claude 模型键：读旧键(ANTHROPIC_SMALL_FAST_MODEL)，写新键(DEFAULT_*), 并删除旧键
     fn normalize_claude_models_in_value(settings: &mut Value) -> bool {
         let mut changed = false;
-        let env = match settings.get_mut("env") {
+        let env = match settings.get_mut("env").and_then(|v| v.as_object_mut()) {
-            Some(v) if v.is_object() => v.as_object_mut().unwrap(),
+            Some(obj) => obj,
-            _ => return changed,
+            None => return changed,
         };
 
         let model = env
@@ -550,6 +551,30 @@ impl ProviderService {
         Ok(())
     }
 
+    /// 将数据库中的当前供应商同步到对应 live 配置
+    pub fn sync_current_from_db(state: &AppState) -> Result<(), AppError> {
+        for app_type in [AppType::Claude, AppType::Codex, AppType::Gemini] {
+            let current_id = match state.db.get_current_provider(app_type.as_str())? {
+                Some(id) => id,
+                None => continue,
+            };
+            let providers = state.db.get_all_providers(app_type.as_str())?;
+            if let Some(provider) = providers.get(&current_id) {
+                Self::write_live_snapshot(&app_type, provider)?;
+            } else {
+                log::warn!(
+                    "无法同步 live 配置: 当前供应商 {} ({}) 未找到",
+                    current_id,
+                    app_type.as_str()
+                );
+            }
+        }
+
+        // MCP 同步
+        McpService::sync_all_enabled(state)?;
+        Ok(())
+    }
+
     /// 列出指定应用下的所有供应商
     pub fn list(
         state: &AppState,

src-tauri/src/services/skill.rs

@@ -231,7 +231,12 @@ impl SkillService {
             // 解析技能元数据
             match self.parse_skill_metadata(&skill_md) {
                 Ok(meta) => {
-                    let directory = path.file_name().unwrap().to_string_lossy().to_string();
+                    // 安全地获取目录名
+                    let Some(dir_name) = path.file_name() else {
+                        log::warn!("Failed to get directory name from path: {path:?}");
+                        continue;
+                    };
+                    let directory = dir_name.to_string_lossy().to_string();
 
                     // 构建 README URL（考虑 skillsPath）
                     let readme_path = if let Some(ref skills_path) = repo.skills_path {
@@ -305,7 +310,12 @@ impl SkillService {
                 continue;
             }
 
-            let directory = path.file_name().unwrap().to_string_lossy().to_string();
+            // 安全地获取目录名
+            let Some(dir_name) = path.file_name() else {
+                log::warn!("Failed to get directory name from path: {path:?}");
+                continue;
+            };
+            let directory = dir_name.to_string_lossy().to_string();
 
             // 更新已安装状态
             let mut found = false;

src-tauri/src/settings.rs

@@ -2,8 +2,9 @@ use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::fs;
 use std::path::PathBuf;
-use std::sync::{OnceLock, RwLock};
+use std::sync::{Arc, OnceLock, RwLock};
 
+use crate::database::Database;
 use crate::error::AppError;
 
 /// 自定义端点配置
@@ -90,8 +91,7 @@ impl Default for AppSettings {
 
 impl AppSettings {
     fn settings_path() -> PathBuf {
-        // settings.json 必须使用固定路径，不能被 app_config_dir 覆盖
+        // settings.json 保留用于旧版本迁移和无数据库场景
-        // 否则会造成循环依赖：读取 settings 需要知道路径，但路径在 settings 中
         dirs::home_dir()
             .expect("无法获取用户主目录")
             .join(".cc-switch")
@@ -128,7 +128,7 @@ impl AppSettings {
             .map(|s| s.to_string());
     }
 
-    pub fn load() -> Self {
+    fn load_from_file() -> Self {
         let path = Self::settings_path();
         if let Ok(content) = fs::read_to_string(&path) {
             match serde_json::from_str::<AppSettings>(&content) {
@@ -149,26 +149,80 @@ impl AppSettings {
             Self::default()
         }
     }
+}
 
-    pub fn save(&self) -> Result<(), AppError> {
+fn save_settings_file(settings: &AppSettings) -> Result<(), AppError> {
-        let mut normalized = self.clone();
+    let mut normalized = settings.clone();
-        normalized.normalize_paths();
+    normalized.normalize_paths();
-        let path = Self::settings_path();
+    let path = AppSettings::settings_path();
 
-        if let Some(parent) = path.parent() {
+    if let Some(parent) = path.parent() {
-            fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?;
+        fs::create_dir_all(parent).map_err(|e| AppError::io(parent, e))?;
-        }
+    }
 
-        let json = serde_json::to_string_pretty(&normalized)
+    let json = serde_json::to_string_pretty(&normalized)
-            .map_err(|e| AppError::JsonSerialize { source: e })?;
+        .map_err(|e| AppError::JsonSerialize { source: e })?;
-        fs::write(&path, json).map_err(|e| AppError::io(&path, e))?;
+    fs::write(&path, json).map_err(|e| AppError::io(&path, e))?;
-        Ok(())
+    Ok(())
+}
+
+static SETTINGS_STORE: OnceLock<RwLock<AppSettings>> = OnceLock::new();
+
+fn settings_store() -> &'static RwLock<AppSettings> {
+    SETTINGS_STORE.get_or_init(|| RwLock::new(load_initial_settings()))
+}
+
+static SETTINGS_DB: OnceLock<Arc<Database>> = OnceLock::new();
+const APP_SETTINGS_KEY: &str = "app_settings";
+
+pub fn bind_db(db: Arc<Database>) {
+    if SETTINGS_DB.set(db).is_err() {
+        return;
+    }
+
+    if let Some(store) = SETTINGS_STORE.get() {
+        let mut guard = store.write().expect("写入设置锁失败");
+        *guard = load_initial_settings();
     }
 }
 
-fn settings_store() -> &'static RwLock<AppSettings> {
+fn load_initial_settings() -> AppSettings {
-    static STORE: OnceLock<RwLock<AppSettings>> = OnceLock::new();
+    if let Some(db) = SETTINGS_DB.get() {
-    STORE.get_or_init(|| RwLock::new(AppSettings::load()))
+        if let Some(from_db) = load_from_db(db.as_ref()) {
+            return from_db;
+        }
+
+        // 从文件迁移一次并写入数据库
+        let file_settings = AppSettings::load_from_file();
+        if let Err(e) = save_to_db(db.as_ref(), &file_settings) {
+            log::warn!("迁移设置到数据库失败，将继续使用内存副本: {e}");
+        }
+        return file_settings;
+    }
+
+    AppSettings::load_from_file()
+}
+
+fn load_from_db(db: &Database) -> Option<AppSettings> {
+    let raw = db.get_setting(APP_SETTINGS_KEY).ok()??;
+    match serde_json::from_str::<AppSettings>(&raw) {
+        Ok(mut settings) => {
+            settings.normalize_paths();
+            Some(settings)
+        }
+        Err(err) => {
+            log::warn!("解析数据库中 app_settings 失败: {err}");
+            None
+        }
+    }
+}
+
+fn save_to_db(db: &Database, settings: &AppSettings) -> Result<(), AppError> {
+    let mut normalized = settings.clone();
+    normalized.normalize_paths();
+    let json =
+        serde_json::to_string(&normalized).map_err(|e| AppError::JsonSerialize { source: e })?;
+    db.set_setting(APP_SETTINGS_KEY, &json)
 }
 
 fn resolve_override_path(raw: &str) -> PathBuf {
@@ -195,7 +249,11 @@ pub fn get_settings() -> AppSettings {
 
 pub fn update_settings(mut new_settings: AppSettings) -> Result<(), AppError> {
     new_settings.normalize_paths();
-    new_settings.save()?;
+    if let Some(db) = SETTINGS_DB.get() {
+        save_to_db(db, &new_settings)?;
+    } else {
+        save_settings_file(&new_settings)?;
+    }
 
     let mut guard = settings_store().write().expect("写入设置锁失败");
     *guard = new_settings;

src-tauri/tests/deeplink_import.rs

@@ -1,46 +1,36 @@
-use std::sync::RwLock;
+use std::sync::Arc;
 
-use cc_switch_lib::{
+use cc_switch_lib::{import_provider_from_deeplink, parse_deeplink_url, AppState, Database};
-    import_provider_from_deeplink, parse_deeplink_url, AppState, AppType, MultiAppConfig,
-};
 
 #[path = "support.rs"]
 mod support;
 use support::{ensure_test_home, reset_test_fs, test_mutex};
 
 #[test]
-fn deeplink_import_claude_provider_persists_to_config() {
+fn deeplink_import_claude_provider_persists_to_db() {
     let _guard = test_mutex().lock().expect("acquire test mutex");
     reset_test_fs();
-    let home = ensure_test_home();
+    let _home = ensure_test_home();
 
-    let url = "ccswitch://v1/import?resource=provider&app=claude&name=DeepLink%20Claude&homepage=https%3A%2F%2Fexample.com&endpoint=https%3A%2F%2Fapi.example.com%2Fv1&apiKey=sk-test-claude-key&model=claude-sonnet-4";
+    let url = "ccswitch://v1/import?resource=provider&app=claude&name=DeepLink%20Claude&homepage=https%3A%2F%2Fexample.com&endpoint=https%3A%2F%2Fapi.example.com%2Fv1&apiKey=sk-test-claude-key&model=claude-sonnet-4&icon=claude";
     let request = parse_deeplink_url(url).expect("parse deeplink url");
 
-    let mut config = MultiAppConfig::default();
+    let db = Arc::new(Database::memory().expect("create memory db"));
-    config.ensure_app(&AppType::Claude);
 
-    let state = AppState {
+    let state = AppState { db: db.clone() };
-        config: RwLock::new(config),
-    };
 
     let provider_id = import_provider_from_deeplink(&state, request.clone())
         .expect("import provider from deeplink");
 
-    // 验证内存状态
+    // Verify DB state
-    let guard = state.config.read().expect("read config");
+    let providers = db.get_all_providers("claude").expect("get providers");
-    let manager = guard
+    let provider = providers
-        .get_manager(&AppType::Claude)
-        .expect("claude manager should exist");
-    let provider = manager
-        .providers
         .get(&provider_id)
         .expect("provider created via deeplink");
-    assert_eq!(provider.name, request.name);
+
-    assert_eq!(
+    assert_eq!(provider.name, request.name.clone().unwrap());
-        provider.website_url.as_deref(),
+    assert_eq!(provider.website_url.as_deref(), request.homepage.as_deref());
-        Some(request.homepage.as_str())
+    assert_eq!(provider.icon.as_deref(), Some("claude"));
-    );
     let auth_token = provider
         .settings_config
         .pointer("/env/ANTHROPIC_AUTH_TOKEN")
@@ -49,50 +39,34 @@ fn deeplink_import_claude_provider_persists_to_config() {
         .settings_config
         .pointer("/env/ANTHROPIC_BASE_URL")
         .and_then(|v| v.as_str());
-    assert_eq!(auth_token, Some(request.api_key.as_str()));
+    assert_eq!(auth_token, request.api_key.as_deref());
-    assert_eq!(base_url, Some(request.endpoint.as_str()));
+    assert_eq!(base_url, request.endpoint.as_deref());
-    drop(guard);
-
-    // 验证配置已持久化
-    let config_path = home.join(".cc-switch").join("config.json");
-    assert!(
-        config_path.exists(),
-        "importing provider from deeplink should persist config.json"
-    );
 }
 
 #[test]
 fn deeplink_import_codex_provider_builds_auth_and_config() {
     let _guard = test_mutex().lock().expect("acquire test mutex");
     reset_test_fs();
-    let home = ensure_test_home();
+    let _home = ensure_test_home();
 
-    let url = "ccswitch://v1/import?resource=provider&app=codex&name=DeepLink%20Codex&homepage=https%3A%2F%2Fopenai.example&endpoint=https%3A%2F%2Fapi.openai.example%2Fv1&apiKey=sk-test-codex-key&model=gpt-4o";
+    let url = "ccswitch://v1/import?resource=provider&app=codex&name=DeepLink%20Codex&homepage=https%3A%2F%2Fopenai.example&endpoint=https%3A%2F%2Fapi.openai.example%2Fv1&apiKey=sk-test-codex-key&model=gpt-4o&icon=openai";
     let request = parse_deeplink_url(url).expect("parse deeplink url");
 
-    let mut config = MultiAppConfig::default();
+    let db = Arc::new(Database::memory().expect("create memory db"));
-    config.ensure_app(&AppType::Codex);
 
-    let state = AppState {
+    let state = AppState { db: db.clone() };
-        config: RwLock::new(config),
-    };
 
     let provider_id = import_provider_from_deeplink(&state, request.clone())
         .expect("import provider from deeplink");
 
-    let guard = state.config.read().expect("read config");
+    let providers = db.get_all_providers("codex").expect("get providers");
-    let manager = guard
+    let provider = providers
-        .get_manager(&AppType::Codex)
-        .expect("codex manager should exist");
-    let provider = manager
-        .providers
         .get(&provider_id)
         .expect("provider created via deeplink");
-    assert_eq!(provider.name, request.name);
+
-    assert_eq!(
+    assert_eq!(provider.name, request.name.clone().unwrap());
-        provider.website_url.as_deref(),
+    assert_eq!(provider.website_url.as_deref(), request.homepage.as_deref());
-        Some(request.homepage.as_str())
+    assert_eq!(provider.icon.as_deref(), Some("openai"));
-    );
     let auth_value = provider
         .settings_config
         .pointer("/auth/OPENAI_API_KEY")
@@ -102,20 +76,13 @@ fn deeplink_import_codex_provider_builds_auth_and_config() {
         .get("config")
         .and_then(|v| v.as_str())
         .unwrap_or_default();
-    assert_eq!(auth_value, Some(request.api_key.as_str()));
+    assert_eq!(auth_value, request.api_key.as_deref());
     assert!(
-        config_text.contains(request.endpoint.as_str()),
+        config_text.contains(request.endpoint.as_deref().unwrap()),
         "config.toml content should contain endpoint"
     );
     assert!(
         config_text.contains("model = \"gpt-4o\""),
         "config.toml content should contain model setting"
     );
-    drop(guard);
-
-    let config_path = home.join(".cc-switch").join("config.json");
-    assert!(
-        config_path.exists(),
-        "importing provider from deeplink should persist config.json"
-    );
 }

src/components/AppSwitcher.tsx

@@ -1,5 +1,5 @@
 import type { AppId } from "@/lib/api";
-import { ClaudeIcon, CodexIcon, GeminiIcon } from "./BrandIcons";
+import { ProviderIcon } from "@/components/ProviderIcon";
 
 interface AppSwitcherProps {
   activeApp: AppId;
@@ -11,6 +11,17 @@ export function AppSwitcher({ activeApp, onSwitch }: AppSwitcherProps) {
     if (app === activeApp) return;
     onSwitch(app);
   };
+  const iconSize = 20;
+  const appIconName: Record<AppId, string> = {
+    claude: "claude",
+    codex: "openai",
+    gemini: "gemini",
+  };
+  const appDisplayName: Record<AppId, string> = {
+    claude: "Claude",
+    codex: "Codex",
+    gemini: "Gemini",
+  };
 
   return (
     <div className="inline-flex bg-gray-100 dark:bg-gray-800 rounded-lg p-1 gap-1">
@@ -23,15 +34,17 @@ export function AppSwitcher({ activeApp, onSwitch }: AppSwitcherProps) {
             : "text-gray-500 hover:text-gray-900 hover:bg-white/50 dark:text-gray-400 dark:hover:text-gray-100 dark:hover:bg-gray-800/60"
         }`}
       >
-        <ClaudeIcon
+        <ProviderIcon
-          size={16}
+          icon={appIconName.claude}
+          name={appDisplayName.claude}
+          size={iconSize}
           className={
             activeApp === "claude"
               ? "text-foreground"
               : "text-gray-500 dark:text-gray-400 group-hover:text-foreground transition-colors"
           }
         />
-        <span>Claude</span>
+        <span>{appDisplayName.claude}</span>
       </button>
 
       <button
@@ -43,15 +56,17 @@ export function AppSwitcher({ activeApp, onSwitch }: AppSwitcherProps) {
             : "text-gray-500 hover:text-gray-900 hover:bg-white/50 dark:text-gray-400 dark:hover:text-gray-100 dark:hover:bg-gray-800/60"
         }`}
       >
-        <CodexIcon
+        <ProviderIcon
-          size={16}
+          icon={appIconName.codex}
+          name={appDisplayName.codex}
+          size={iconSize}
           className={
             activeApp === "codex"
               ? "text-foreground"
               : "text-gray-500 dark:text-gray-400 group-hover:text-foreground transition-colors"
           }
         />
-        <span>Codex</span>
+        <span>{appDisplayName.codex}</span>
       </button>
 
       <button
@@ -63,15 +78,17 @@ export function AppSwitcher({ activeApp, onSwitch }: AppSwitcherProps) {
             : "text-gray-500 hover:text-gray-900 hover:bg-white/50 dark:text-gray-400 dark:hover:text-gray-100 dark:hover:bg-gray-800/60"
         }`}
       >
-        <GeminiIcon
+        <ProviderIcon
-          size={16}
+          icon={appIconName.gemini}
+          name={appDisplayName.gemini}
+          size={iconSize}
           className={
             activeApp === "gemini"
               ? "text-foreground"
               : "text-gray-500 dark:text-gray-400 group-hover:text-foreground transition-colors"
           }
         />
-        <span>Gemini</span>
+        <span>{appDisplayName.gemini}</span>
       </button>
     </div>
   );

src/components/DeepLinkImportDialog.tsx

@@ -13,6 +13,10 @@ import { Button } from "@/components/ui/button";
 import { toast } from "sonner";
 import { useTranslation } from "react-i18next";
 import { useQueryClient } from "@tanstack/react-query";
+import { PromptConfirmation } from "./deeplink/PromptConfirmation";
+import { McpConfirmation } from "./deeplink/McpConfirmation";
+import { SkillConfirmation } from "./deeplink/SkillConfirmation";
+import { ProviderIcon } from "./ProviderIcon";
 
 interface DeeplinkError {
   url: string;
@@ -26,6 +30,24 @@ export function DeepLinkImportDialog() {
   const [isImporting, setIsImporting] = useState(false);
   const [isOpen, setIsOpen] = useState(false);
 
+  // 容错判断：MCP 导入结果可能缺少 type 字段
+  const isMcpImportResult = (
+    value: unknown,
+  ): value is {
+    importedCount: number;
+    importedIds: string[];
+    failed: Array<{ id: string; error: string }>;
+    type?: "mcp";
+  } => {
+    if (!value || typeof value !== "object") return false;
+    const v = value as Record<string, unknown>;
+    return (
+      typeof v.importedCount === "number" &&
+      Array.isArray(v.importedIds) &&
+      Array.isArray(v.failed)
+    );
+  };
+
   useEffect(() => {
     // Listen for deep link import events
     const unlistenImport = listen<DeepLinkImportRequest>(
@@ -78,22 +100,89 @@ export function DeepLinkImportDialog() {
     setIsImporting(true);
 
     try {
-      await deeplinkApi.importFromDeeplink(request);
+      const result = await deeplinkApi.importFromDeeplink(request);
+      const refreshMcp = async (summary: {
+        importedCount: number;
+        importedIds: string[];
+        failed: Array<{ id: string; error: string }>;
+      }) => {
+        // 强制刷新 MCP 相关缓存，确保管理页重新从数据库加载
+        await queryClient.invalidateQueries({
+          queryKey: ["mcp", "all"],
+          refetchType: "all",
+        });
+        await queryClient.refetchQueries({
+          queryKey: ["mcp", "all"],
+          type: "all",
+        });
 
-      // Invalidate provider queries to refresh the list
+        if (summary.failed.length > 0) {
-      await queryClient.invalidateQueries({
+          toast.warning(`部分导入成功`, {
-        queryKey: ["providers", request.app],
+            description: `成功: ${summary.importedCount}, 失败: ${summary.failed.length}`,
-      });
+          });
+        } else {
+          toast.success("MCP Servers 导入成功", {
+            description: `成功导入 ${summary.importedCount} 个服务器`,
+          });
+        }
+      };
 
-      toast.success(t("deeplink.importSuccess"), {
+      // Handle different result types
-        description: t("deeplink.importSuccessDescription", {
+      if ("type" in result) {
-          name: request.name,
+        if (result.type === "provider") {
-        }),
+          await queryClient.invalidateQueries({
-      });
+            queryKey: ["providers", request.app],
+          });
+          toast.success(t("deeplink.importSuccess"), {
+            description: t("deeplink.importSuccessDescription", {
+              name: request.name,
+            }),
+          });
+        } else if (result.type === "prompt") {
+          // Prompts don't use React Query, trigger a custom event for refresh
+          window.dispatchEvent(
+            new CustomEvent("prompt-imported", {
+              detail: { app: request.app },
+            }),
+          );
+          toast.success("提示词导入成功", {
+            description: `已导入提示词: ${request.name}`,
+          });
+        } else if (result.type === "mcp") {
+          await refreshMcp(result);
+        } else if (result.type === "skill") {
+          // Refresh Skills with aggressive strategy
+          queryClient.invalidateQueries({
+            queryKey: ["skills"],
+            refetchType: "all",
+          });
+          await queryClient.refetchQueries({
+            queryKey: ["skills"],
+            type: "all",
+          });
+          toast.success("Skill 仓库添加成功", {
+            description: `已添加仓库: ${request.repo}`,
+          });
+        }
+      } else if (isMcpImportResult(result)) {
+        // 兜底处理：旧版本后端可能未返回 type 字段
+        await refreshMcp(result);
+      } else {
+        // Legacy return type (string ID) - assume provider
+        await queryClient.invalidateQueries({
+          queryKey: ["providers", request.app],
+        });
+        toast.success(t("deeplink.importSuccess"), {
+          description: t("deeplink.importSuccessDescription", {
+            name: request.name,
+          }),
+        });
+      }
 
+      // Close dialog after all refreshes complete
       setIsOpen(false);
     } catch (error) {
-      console.error("Failed to import provider from deep link:", error);
+      console.error("Failed to import from deep link:", error);
       toast.error(t("deeplink.importError"), {
         description: error instanceof Error ? error.message : String(error),
       });
@@ -189,6 +278,34 @@ export function DeepLinkImportDialog() {
     return value;
   };
 
+  const getTitle = () => {
+    if (!request) return t("deeplink.confirmImport");
+    switch (request.resource) {
+      case "prompt":
+        return "导入提示词";
+      case "mcp":
+        return "导入 MCP Servers";
+      case "skill":
+        return "添加 Skill 仓库";
+      default:
+        return t("deeplink.confirmImport");
+    }
+  };
+
+  const getDescription = () => {
+    if (!request) return t("deeplink.confirmImportDescription");
+    switch (request.resource) {
+      case "prompt":
+        return "请确认是否导入此系统提示词";
+      case "mcp":
+        return "请确认是否导入这些 MCP Servers";
+      case "skill":
+        return "请确认是否添加此 Skill 仓库";
+      default:
+        return t("deeplink.confirmImportDescription");
+    }
+  };
+
   return (
     <Dialog open={isOpen && !!request} onOpenChange={setIsOpen}>
       <DialogContent className="sm:max-w-[500px]" zIndex="top">
@@ -196,151 +313,197 @@ export function DeepLinkImportDialog() {
           <>
             {/* 标题显式左对齐，避免默认居中样式影响 */}
             <DialogHeader className="text-left sm:text-left">
-              <DialogTitle>{t("deeplink.confirmImport")}</DialogTitle>
+              <DialogTitle>{getTitle()}</DialogTitle>
-              <DialogDescription>
+              <DialogDescription>{getDescription()}</DialogDescription>
-                {t("deeplink.confirmImportDescription")}
-              </DialogDescription>
             </DialogHeader>
 
             {/* 主体内容整体右移，略大于标题内边距，让内容看起来不贴边 */}
             <div className="space-y-4 px-8 py-4 max-h-[60vh] overflow-y-auto [scrollbar-width:thin] [&::-webkit-scrollbar]:w-1.5 [&::-webkit-scrollbar]:block [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:bg-gray-200 dark:[&::-webkit-scrollbar-thumb]:bg-gray-700">
-              {/* App Type */}
+              {request.resource === "prompt" && (
-              <div className="grid grid-cols-3 items-center gap-4">
+                <PromptConfirmation request={request} />
-                <div className="font-medium text-sm text-muted-foreground">
+              )}
-                  {t("deeplink.app")}
+              {request.resource === "mcp" && (
-                </div>
+                <McpConfirmation request={request} />
-                <div className="col-span-2 text-sm font-medium capitalize">
+              )}
-                  {request.app}
+              {request.resource === "skill" && (
-                </div>
+                <SkillConfirmation request={request} />
-              </div>
-
-              {/* Provider Name */}
-              <div className="grid grid-cols-3 items-center gap-4">
-                <div className="font-medium text-sm text-muted-foreground">
-                  {t("deeplink.providerName")}
-                </div>
-                <div className="col-span-2 text-sm font-medium">
-                  {request.name}
-                </div>
-              </div>
-
-              {/* Homepage */}
-              <div className="grid grid-cols-3 items-center gap-4">
-                <div className="font-medium text-sm text-muted-foreground">
-                  {t("deeplink.homepage")}
-                </div>
-                <div className="col-span-2 text-sm break-all text-blue-600 dark:text-blue-400">
-                  {request.homepage}
-                </div>
-              </div>
-
-              {/* API Endpoint */}
-              <div className="grid grid-cols-3 items-center gap-4">
-                <div className="font-medium text-sm text-muted-foreground">
-                  {t("deeplink.endpoint")}
-                </div>
-                <div className="col-span-2 text-sm break-all">
-                  {request.endpoint}
-                </div>
-              </div>
-
-              {/* API Key (masked) */}
-              <div className="grid grid-cols-3 items-center gap-4">
-                <div className="font-medium text-sm text-muted-foreground">
-                  {t("deeplink.apiKey")}
-                </div>
-                <div className="col-span-2 text-sm font-mono text-muted-foreground">
-                  {maskedApiKey}
-                </div>
-              </div>
-
-              {/* Model (if present) */}
-              {request.model && (
-                <div className="grid grid-cols-3 items-center gap-4">
-                  <div className="font-medium text-sm text-muted-foreground">
-                    {t("deeplink.model")}
-                  </div>
-                  <div className="col-span-2 text-sm font-mono">
-                    {request.model}
-                  </div>
-                </div>
               )}
 
-              {/* Notes (if present) */}
+              {/* Legacy Provider View */}
-              {request.notes && (
+              {(request.resource === "provider" || !request.resource) && (
-                <div className="grid grid-cols-3 items-start gap-4">
+                <>
-                  <div className="font-medium text-sm text-muted-foreground">
+                  {/* Provider Icon - enlarge and center near the top */}
-                    {t("deeplink.notes")}
+                  {request.icon && (
-                  </div>
+                    <div className="flex justify-center pt-2 pb-1">
-                  <div className="col-span-2 text-sm text-muted-foreground">
+                      <ProviderIcon
-                    {request.notes}
+                        icon={request.icon}
-                  </div>
+                        name={request.name || request.icon}
-                </div>
+                        size={80}
-              )}
+                        className="drop-shadow-sm"
+                      />
+                    </div>
+                  )}
 
-              {/* Config File Details (v3.8+) */}
+                  {/* App Type */}
-              {hasConfigFile && (
-                <div className="space-y-3 pt-2 border-t border-border-default">
                   <div className="grid grid-cols-3 items-center gap-4">
                     <div className="font-medium text-sm text-muted-foreground">
-                      {t("deeplink.configSource")}
+                      {t("deeplink.app")}
                     </div>
-                    <div className="col-span-2 text-sm">
+                    <div className="col-span-2 text-sm font-medium capitalize">
-                      <span className="inline-flex items-center px-2 py-0.5 rounded-md bg-blue-100 dark:bg-blue-900/30 text-blue-700 dark:text-blue-300 text-xs font-medium">
+                      {request.app}
-                        {configSource === "base64"
-                          ? t("deeplink.configEmbedded")
-                          : t("deeplink.configRemote")}
-                      </span>
-                      {request.configFormat && (
-                        <span className="ml-2 text-xs text-muted-foreground uppercase">
-                          {request.configFormat}
-                        </span>
-                      )}
                     </div>
                   </div>
 
-                  {/* Parsed Config Details */}
+                  {/* Provider Name */}
-                  {parsedConfig && (
+                  <div className="grid grid-cols-3 items-center gap-4">
-                    <div className="rounded-lg bg-muted/50 p-3 space-y-2">
+                    <div className="font-medium text-sm text-muted-foreground">
-                      <div className="text-xs font-medium text-muted-foreground uppercase tracking-wide">
+                      {t("deeplink.providerName")}
-                        {t("deeplink.configDetails")}
+                    </div>
-                      </div>
+                    <div className="col-span-2 text-sm font-medium">
+                      {request.name}
+                    </div>
+                  </div>
 
-                      {/* Claude config */}
+                  {/* Homepage */}
-                      {parsedConfig.type === "claude" && parsedConfig.env && (
+                  <div className="grid grid-cols-3 items-center gap-4">
-                        <div className="space-y-1.5">
+                    <div className="font-medium text-sm text-muted-foreground">
-                          {Object.entries(parsedConfig.env).map(
+                      {t("deeplink.homepage")}
-                            ([key, value]) => (
+                    </div>
-                              <div
+                    <div className="col-span-2 text-sm break-all text-blue-600 dark:text-blue-400">
-                                key={key}
+                      {request.homepage}
-                                className="grid grid-cols-2 gap-2 text-xs"
+                    </div>
-                              >
+                  </div>
-                                <span className="font-mono text-muted-foreground truncate">
+
-                                  {key}
+                  {/* API Endpoint */}
-                                </span>
+                  <div className="grid grid-cols-3 items-center gap-4">
-                                <span className="font-mono truncate">
+                    <div className="font-medium text-sm text-muted-foreground">
-                                  {maskValue(key, String(value))}
+                      {t("deeplink.endpoint")}
-                                </span>
+                    </div>
-                              </div>
+                    <div className="col-span-2 text-sm break-all">
-                            ),
+                      {request.endpoint}
-                          )}
+                    </div>
+                  </div>
+
+                  {/* API Key (masked) */}
+                  <div className="grid grid-cols-3 items-center gap-4">
+                    <div className="font-medium text-sm text-muted-foreground">
+                      {t("deeplink.apiKey")}
+                    </div>
+                    <div className="col-span-2 text-sm font-mono text-muted-foreground">
+                      {maskedApiKey}
+                    </div>
+                  </div>
+
+                  {/* Model Fields - 根据应用类型显示不同的模型字段 */}
+                  {request.app === "claude" ? (
+                    <>
+                      {/* Claude 四种模型字段 */}
+                      {request.haikuModel && (
+                        <div className="grid grid-cols-3 items-center gap-4">
+                          <div className="font-medium text-sm text-muted-foreground">
+                            {t("deeplink.haikuModel")}
+                          </div>
+                          <div className="col-span-2 text-sm font-mono">
+                            {request.haikuModel}
+                          </div>
                         </div>
                       )}
+                      {request.sonnetModel && (
+                        <div className="grid grid-cols-3 items-center gap-4">
+                          <div className="font-medium text-sm text-muted-foreground">
+                            {t("deeplink.sonnetModel")}
+                          </div>
+                          <div className="col-span-2 text-sm font-mono">
+                            {request.sonnetModel}
+                          </div>
+                        </div>
+                      )}
+                      {request.opusModel && (
+                        <div className="grid grid-cols-3 items-center gap-4">
+                          <div className="font-medium text-sm text-muted-foreground">
+                            {t("deeplink.opusModel")}
+                          </div>
+                          <div className="col-span-2 text-sm font-mono">
+                            {request.opusModel}
+                          </div>
+                        </div>
+                      )}
+                      {request.model && (
+                        <div className="grid grid-cols-3 items-center gap-4">
+                          <div className="font-medium text-sm text-muted-foreground">
+                            {t("deeplink.multiModel")}
+                          </div>
+                          <div className="col-span-2 text-sm font-mono">
+                            {request.model}
+                          </div>
+                        </div>
+                      )}
+                    </>
+                  ) : (
+                    <>
+                      {/* Codex 和 Gemini 使用通用 model 字段 */}
+                      {request.model && (
+                        <div className="grid grid-cols-3 items-center gap-4">
+                          <div className="font-medium text-sm text-muted-foreground">
+                            {t("deeplink.model")}
+                          </div>
+                          <div className="col-span-2 text-sm font-mono">
+                            {request.model}
+                          </div>
+                        </div>
+                      )}
+                    </>
+                  )}
 
-                      {/* Codex config */}
+                  {/* Notes (if present) */}
-                      {parsedConfig.type === "codex" && (
+                  {request.notes && (
-                        <div className="space-y-2">
+                    <div className="grid grid-cols-3 items-start gap-4">
-                          {parsedConfig.auth &&
+                      <div className="font-medium text-sm text-muted-foreground">
-                            Object.keys(parsedConfig.auth).length > 0 && (
+                        {t("deeplink.notes")}
+                      </div>
+                      <div className="col-span-2 text-sm text-muted-foreground">
+                        {request.notes}
+                      </div>
+                    </div>
+                  )}
+
+                  {/* Config File Details (v3.8+) */}
+                  {hasConfigFile && (
+                    <div className="space-y-3 pt-2 border-t border-border-default">
+                      <div className="grid grid-cols-3 items-center gap-4">
+                        <div className="font-medium text-sm text-muted-foreground">
+                          {t("deeplink.configSource")}
+                        </div>
+                        <div className="col-span-2 text-sm">
+                          <span className="inline-flex items-center px-2 py-0.5 rounded-md bg-blue-100 dark:bg-blue-900/30 text-blue-700 dark:text-blue-300 text-xs font-medium">
+                            {configSource === "base64"
+                              ? t("deeplink.configEmbedded")
+                              : t("deeplink.configRemote")}
+                          </span>
+                          {request.configFormat && (
+                            <span className="ml-2 text-xs text-muted-foreground uppercase">
+                              {request.configFormat}
+                            </span>
+                          )}
+                        </div>
+                      </div>
+
+                      {/* Parsed Config Details */}
+                      {parsedConfig && (
+                        <div className="rounded-lg bg-muted/50 p-3 space-y-2">
+                          <div className="text-xs font-medium text-muted-foreground uppercase tracking-wide">
+                            {t("deeplink.configDetails")}
+                          </div>
+
+                          {/* Claude config */}
+                          {parsedConfig.type === "claude" &&
+                            parsedConfig.env && (
                               <div className="space-y-1.5">
-                                <div className="text-xs text-muted-foreground">
+                                {Object.entries(parsedConfig.env).map(
-                                  Auth:
-                                </div>
-                                {Object.entries(parsedConfig.auth).map(
                                   ([key, value]) => (
                                     <div
                                       key={key}
-                                      className="grid grid-cols-2 gap-2 text-xs pl-2"
+                                      className="grid grid-cols-2 gap-2 text-xs"
                                     >
                                       <span className="font-mono text-muted-foreground truncate">
                                         {key}
@@ -353,61 +516,92 @@ export function DeepLinkImportDialog() {
                                 )}
                               </div>
                             )}
-                          {parsedConfig.tomlConfig && (
+
-                            <div className="space-y-1">
+                          {/* Codex config */}
-                              <div className="text-xs text-muted-foreground">
+                          {parsedConfig.type === "codex" && (
-                                TOML Config:
+                            <div className="space-y-2">
-                              </div>
+                              {parsedConfig.auth &&
-                              <pre className="text-xs font-mono bg-background p-2 rounded overflow-x-auto max-h-24 whitespace-pre-wrap">
+                                Object.keys(parsedConfig.auth).length > 0 && (
-                                {parsedConfig.tomlConfig.substring(0, 300)}
+                                  <div className="space-y-1.5">
-                                {parsedConfig.tomlConfig.length > 300 && "..."}
+                                    <div className="text-xs text-muted-foreground">
-                              </pre>
+                                      Auth:
+                                    </div>
+                                    {Object.entries(parsedConfig.auth).map(
+                                      ([key, value]) => (
+                                        <div
+                                          key={key}
+                                          className="grid grid-cols-2 gap-2 text-xs pl-2"
+                                        >
+                                          <span className="font-mono text-muted-foreground truncate">
+                                            {key}
+                                          </span>
+                                          <span className="font-mono truncate">
+                                            {maskValue(key, String(value))}
+                                          </span>
+                                        </div>
+                                      ),
+                                    )}
+                                  </div>
+                                )}
+                              {parsedConfig.tomlConfig && (
+                                <div className="space-y-1">
+                                  <div className="text-xs text-muted-foreground">
+                                    TOML Config:
+                                  </div>
+                                  <pre className="text-xs font-mono bg-background p-2 rounded overflow-x-auto max-h-24 whitespace-pre-wrap">
+                                    {parsedConfig.tomlConfig.substring(0, 300)}
+                                    {parsedConfig.tomlConfig.length > 300 &&
+                                      "..."}
+                                  </pre>
+                                </div>
+                              )}
                             </div>
                           )}
-                        </div>
-                      )}
 
-                      {/* Gemini config */}
+                          {/* Gemini config */}
-                      {parsedConfig.type === "gemini" && parsedConfig.env && (
+                          {parsedConfig.type === "gemini" &&
-                        <div className="space-y-1.5">
+                            parsedConfig.env && (
-                          {Object.entries(parsedConfig.env).map(
+                              <div className="space-y-1.5">
-                            ([key, value]) => (
+                                {Object.entries(parsedConfig.env).map(
-                              <div
+                                  ([key, value]) => (
-                                key={key}
+                                    <div
-                                className="grid grid-cols-2 gap-2 text-xs"
+                                      key={key}
-                              >
+                                      className="grid grid-cols-2 gap-2 text-xs"
-                                <span className="font-mono text-muted-foreground truncate">
+                                    >
-                                  {key}
+                                      <span className="font-mono text-muted-foreground truncate">
-                                </span>
+                                        {key}
-                                <span className="font-mono truncate">
+                                      </span>
-                                  {maskValue(key, String(value))}
+                                      <span className="font-mono truncate">
-                                </span>
+                                        {maskValue(key, String(value))}
+                                      </span>
+                                    </div>
+                                  ),
+                                )}
                               </div>
-                            ),
+                            )}
-                          )}
+                        </div>
+                      )}
+
+                      {/* Config URL (if remote) */}
+                      {request.configUrl && (
+                        <div className="grid grid-cols-3 items-center gap-4">
+                          <div className="font-medium text-sm text-muted-foreground">
+                            {t("deeplink.configUrl")}
+                          </div>
+                          <div className="col-span-2 text-sm font-mono text-muted-foreground break-all">
+                            {request.configUrl}
+                          </div>
                         </div>
                       )}
                     </div>
                   )}
 
-                  {/* Config URL (if remote) */}
+                  {/* Warning */}
-                  {request.configUrl && (
+                  <div className="rounded-lg bg-yellow-50 dark:bg-yellow-900/20 p-3 text-sm text-yellow-800 dark:text-yellow-200">
-                    <div className="grid grid-cols-3 items-center gap-4">
+                    {t("deeplink.warning")}
-                      <div className="font-medium text-sm text-muted-foreground">
+                  </div>
-                        {t("deeplink.configUrl")}
+                </>
-                      </div>
-                      <div className="col-span-2 text-sm font-mono text-muted-foreground break-all">
-                        {request.configUrl}
-                      </div>
-                    </div>
-                  )}
-                </div>
               )}
-
-              {/* Warning */}
-              <div className="rounded-lg bg-yellow-50 dark:bg-yellow-900/20 p-3 text-sm text-yellow-800 dark:text-yellow-200">
-                {t("deeplink.warning")}
-              </div>
             </div>
 
             <DialogFooter>

src/components/ProviderIcon.tsx

@@ -32,6 +32,9 @@ export const ProviderIcon: React.FC<ProviderIconProps> = ({
     return {
       width: sizeValue,
       height: sizeValue,
+      // 内嵌 SVG 使用 1em 作为尺寸基准，这里同步 fontSize 让图标实际跟随 size 放大
+      fontSize: sizeValue,
+      lineHeight: 1,
     };
   }, [size]);
 
@@ -57,6 +60,8 @@ export const ProviderIcon: React.FC<ProviderIconProps> = ({
       .join("")
       .toUpperCase()
       .slice(0, 2);
+    const fallbackFontSize =
+      typeof size === "number" ? `${Math.max(size * 0.5, 12)}px` : "0.5em";
     return (
       <span
         className={cn(
@@ -68,7 +73,7 @@ export const ProviderIcon: React.FC<ProviderIconProps> = ({
       >
         <span
           style={{
-            fontSize: `${typeof size === "number" ? size * 0.4 : 14}px`,
+            fontSize: fallbackFontSize,
           }}
         >
           {initials}

src/components/deeplink/McpConfirmation.tsx

@@ -0,0 +1,71 @@
+import { useMemo } from "react";
+import { DeepLinkImportRequest } from "../../lib/api/deeplink";
+import { decodeBase64Utf8 } from "../../lib/utils/base64";
+
+export function McpConfirmation({
+  request,
+}: {
+  request: DeepLinkImportRequest;
+}) {
+  const mcpServers = useMemo(() => {
+    if (!request.config) return null;
+    try {
+      const decoded = decodeBase64Utf8(request.config);
+      const parsed = JSON.parse(decoded);
+      return parsed.mcpServers || {};
+    } catch (e) {
+      console.error("Failed to parse MCP config:", e);
+      return null;
+    }
+  }, [request.config]);
+
+  const targetApps = request.apps?.split(",") || [];
+
+  return (
+    <div className="space-y-4">
+      <h3 className="text-lg font-semibold">批量导入 MCP Servers</h3>
+
+      <div>
+        <label className="block text-sm font-medium text-muted-foreground">
+          目标应用
+        </label>
+        <div className="mt-1 flex gap-2 flex-wrap">
+          {targetApps.map((app) => (
+            <span
+              key={app}
+              className="px-2 py-1 bg-primary/10 text-primary text-xs rounded capitalize"
+            >
+              {app.trim()}
+            </span>
+          ))}
+        </div>
+      </div>
+
+      <div>
+        <label className="block text-sm font-medium text-muted-foreground">
+          MCP Servers ({Object.keys(mcpServers || {}).length} 个)
+        </label>
+        <div className="mt-1 space-y-2 max-h-64 overflow-auto border rounded p-2 bg-muted/30">
+          {mcpServers &&
+            Object.entries(mcpServers).map(([id, spec]: [string, any]) => (
+              <div key={id} className="p-2 bg-background rounded border">
+                <div className="font-semibold text-sm">{id}</div>
+                <div className="text-xs text-muted-foreground mt-1 font-mono truncate">
+                  {spec.command
+                    ? `Command: ${spec.command} `
+                    : `URL: ${spec.url} `}
+                </div>
+              </div>
+            ))}
+        </div>
+      </div>
+
+      {request.enabled && (
+        <div className="text-yellow-600 dark:text-yellow-500 text-sm flex items-center gap-2">
+          <span>⚠️</span>
+          <span>导入后将立即写入所有指定应用的配置文件</span>
+        </div>
+      )}
+    </div>
+  );
+}

src/components/deeplink/PromptConfirmation.tsx

@@ -0,0 +1,60 @@
+import { useMemo } from "react";
+import { DeepLinkImportRequest } from "../../lib/api/deeplink";
+import { decodeBase64Utf8 } from "../../lib/utils/base64";
+
+export function PromptConfirmation({
+  request,
+}: {
+  request: DeepLinkImportRequest;
+}) {
+  const decodedContent = useMemo(() => {
+    if (!request.content) return "";
+    return decodeBase64Utf8(request.content);
+  }, [request.content]);
+
+  return (
+    <div className="space-y-4">
+      <h3 className="text-lg font-semibold">导入系统提示词</h3>
+
+      <div>
+        <label className="block text-sm font-medium text-muted-foreground">
+          应用
+        </label>
+        <div className="mt-1 text-sm capitalize">{request.app}</div>
+      </div>
+
+      <div>
+        <label className="block text-sm font-medium text-muted-foreground">
+          名称
+        </label>
+        <div className="mt-1 text-sm">{request.name}</div>
+      </div>
+
+      {request.description && (
+        <div>
+          <label className="block text-sm font-medium text-muted-foreground">
+            描述
+          </label>
+          <div className="mt-1 text-sm">{request.description}</div>
+        </div>
+      )}
+
+      <div>
+        <label className="block text-sm font-medium text-muted-foreground">
+          内容预览
+        </label>
+        <pre className="mt-1 max-h-48 overflow-auto bg-muted/50 p-2 rounded text-xs whitespace-pre-wrap border">
+          {decodedContent.substring(0, 500)}
+          {decodedContent.length > 500 && "..."}
+        </pre>
+      </div>
+
+      {request.enabled && (
+        <div className="text-yellow-600 dark:text-yellow-500 text-sm flex items-center gap-2">
+          <span>⚠️</span>
+          <span>导入后将立即启用此提示词，其他提示词将被禁用</span>
+        </div>
+      )}
+    </div>
+  );
+}

src/components/deeplink/SkillConfirmation.tsx

@@ -0,0 +1,56 @@
+import { DeepLinkImportRequest } from "../../lib/api/deeplink";
+
+export function SkillConfirmation({
+  request,
+}: {
+  request: DeepLinkImportRequest;
+}) {
+  return (
+    <div className="space-y-4">
+      <h3 className="text-lg font-semibold">添加 Claude Skill 仓库</h3>
+
+      <div>
+        <label className="block text-sm font-medium text-muted-foreground">
+          GitHub 仓库
+        </label>
+        <div className="mt-1 text-sm font-mono bg-muted/50 p-2 rounded border">
+          {request.repo}
+        </div>
+      </div>
+
+      <div>
+        <label className="block text-sm font-medium text-muted-foreground">
+          目标目录
+        </label>
+        <div className="mt-1 text-sm font-mono bg-muted/50 p-2 rounded border">
+          {request.directory}
+        </div>
+      </div>
+
+      <div className="grid grid-cols-2 gap-4">
+        <div>
+          <label className="block text-sm font-medium text-muted-foreground">
+            分支
+          </label>
+          <div className="mt-1 text-sm">{request.branch || "main"}</div>
+        </div>
+
+        {request.skillsPath && (
+          <div>
+            <label className="block text-sm font-medium text-muted-foreground">
+              Skills 路径
+            </label>
+            <div className="mt-1 text-sm">{request.skillsPath}</div>
+          </div>
+        )}
+      </div>
+
+      <div className="text-blue-600 dark:text-blue-400 text-sm bg-blue-50 dark:bg-blue-950/30 p-3 rounded border border-blue-200 dark:border-blue-800">
+        <p>ℹ️ 此操作将添加 Skill 仓库到列表。</p>
+        <p className="mt-1">
+          添加后，您可以在 Skills 管理界面中选择安装具体的 Skill。
+        </p>
+      </div>
+    </div>
+  );
+}

src/components/prompts/PromptPanel.tsx

@@ -43,6 +43,22 @@ const PromptPanel = React.forwardRef<PromptPanelHandle, PromptPanelProps>(
       if (open) reload();
     }, [open, reload]);
 
+    // Listen for prompt import events from deep link
+    useEffect(() => {
+      const handlePromptImported = (event: Event) => {
+        const customEvent = event as CustomEvent;
+        // Reload if the import is for this app
+        if (customEvent.detail?.app === appId) {
+          reload();
+        }
+      };
+
+      window.addEventListener("prompt-imported", handlePromptImported);
+      return () => {
+        window.removeEventListener("prompt-imported", handlePromptImported);
+      };
+    }, [appId, reload]);
+
     const handleAdd = () => {
       setEditingId(null);
       setIsFormOpen(true);

src/components/providers/EditProviderDialog.tsx

@@ -78,6 +78,8 @@ export function EditProviderDialog({
     async (values: ProviderFormValues) => {
       if (!provider) return;
 
+      // 注意：values.settingsConfig 已经是最终的配置字符串
+      // ProviderForm 已经为不同的 app 类型（Claude/Codex/Gemini）正确组装了配置
       const parsedConfig = JSON.parse(values.settingsConfig) as Record<
         string,
         unknown

src/components/providers/ProviderCard.tsx

@@ -141,12 +141,12 @@ export function ProviderCard({
           </button>
 
           {/* 供应商图标 */}
-          <div className="h-9 w-9 rounded-lg bg-white/5 flex items-center justify-center border border-gray-200 dark:border-white/10 group-hover:scale-105 transition-transform duration-300">
+          <div className="h-8 w-8 rounded-lg bg-white/5 flex items-center justify-center border border-gray-200 dark:border-white/10 group-hover:scale-105 transition-transform duration-300">
             <ProviderIcon
               icon={provider.icon}
               name={provider.name}
               color={provider.iconColor}
-              size={26}
+              size={20}
             />
           </div>
 

src/components/providers/forms/BasicFormFields.tsx

@@ -84,7 +84,7 @@ export function BasicFormFields({ form }: BasicFormFieldsProps) {
                 </div>
               </div>
               <div className="flex-1 overflow-y-auto">
-                <div className="space-y-6 mx-auto max-w-[56rem] px-6 py-6 w-full">
+                <div className="space-y-2 mx-auto max-w-[56rem] px-6 py-6 w-full">
                   <IconPicker
                     value={currentIcon}
                     onValueChange={handleIconSelect}

src/components/skills/SkillsPage.tsx

@@ -1,7 +1,20 @@
-import { useState, useEffect, useMemo, forwardRef, useImperativeHandle } from "react";
+import {
+  useState,
+  useEffect,
+  useMemo,
+  forwardRef,
+  useImperativeHandle,
+} from "react";
 import { useTranslation } from "react-i18next";
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/components/ui/select";
 import { RefreshCw, Search } from "lucide-react";
 import { toast } from "sonner";
 import { SkillCard } from "./SkillCard";
@@ -26,6 +39,9 @@ export const SkillsPage = forwardRef<SkillsPageHandle, SkillsPageProps>(
     const [loading, setLoading] = useState(true);
     const [repoManagerOpen, setRepoManagerOpen] = useState(false);
     const [searchQuery, setSearchQuery] = useState("");
+    const [filterStatus, setFilterStatus] = useState<
+      "all" | "installed" | "uninstalled"
+    >("all");
 
     const loadSkills = async (afterLoad?: (data: Skill[]) => void) => {
       try {
@@ -166,10 +182,16 @@ export const SkillsPage = forwardRef<SkillsPageHandle, SkillsPageProps>(
 
     // 过滤技能列表
     const filteredSkills = useMemo(() => {
-      if (!searchQuery.trim()) return skills;
+      const byStatus = skills.filter((skill) => {
+        if (filterStatus === "installed") return skill.installed;
+        if (filterStatus === "uninstalled") return !skill.installed;
+        return true;
+      });
+
+      if (!searchQuery.trim()) return byStatus;
 
       const query = searchQuery.toLowerCase();
-      return skills.filter((skill) => {
+      return byStatus.filter((skill) => {
         const name = skill.name?.toLowerCase() || "";
         const description = skill.description?.toLowerCase() || "";
         const directory = skill.directory?.toLowerCase() || "";
@@ -180,7 +202,7 @@ export const SkillsPage = forwardRef<SkillsPageHandle, SkillsPageProps>(
           directory.includes(query)
         );
       });
-    }, [skills, searchQuery]);
+    }, [skills, searchQuery, filterStatus]);
 
     return (
       <div className="flex flex-col h-full min-h-0 bg-background/50">
@@ -212,17 +234,54 @@ export const SkillsPage = forwardRef<SkillsPageHandle, SkillsPageProps>(
             ) : (
               <>
                 {/* 搜索框 */}
-                <div className="mb-6">
+                <div className="mb-6 flex flex-col gap-3 md:flex-row md:items-center">
-                  <div className="relative">
+                  <div className="relative flex-1 min-w-0">
                     <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"
+                      className="pl-9 pr-3"
                     />
                   </div>
+                  <div className="w-full md:w-48">
+                    <Select
+                      value={filterStatus}
+                      onValueChange={(val) =>
+                        setFilterStatus(
+                          val as "all" | "installed" | "uninstalled",
+                        )
+                      }
+                    >
+                      <SelectTrigger className="bg-card border shadow-sm text-foreground">
+                        <SelectValue
+                          placeholder={t("skills.filter.placeholder")}
+                          className="text-left"
+                        />
+                      </SelectTrigger>
+                      <SelectContent className="bg-card text-foreground shadow-lg">
+                        <SelectItem
+                          value="all"
+                          className="text-left pr-3 [&[data-state=checked]>span]:hidden"
+                        >
+                          {t("skills.filter.all")}
+                        </SelectItem>
+                        <SelectItem
+                          value="installed"
+                          className="text-left pr-3 [&[data-state=checked]>span]:hidden"
+                        >
+                          {t("skills.filter.installed")}
+                        </SelectItem>
+                        <SelectItem
+                          value="uninstalled"
+                          className="text-left pr-3 [&[data-state=checked]>span]:hidden"
+                        >
+                          {t("skills.filter.uninstalled")}
+                        </SelectItem>
+                      </SelectContent>
+                    </Select>
+                  </div>
                   {searchQuery && (
                     <p className="mt-2 text-sm text-muted-foreground">
                       {t("skills.count", { count: filteredSkills.length })}

src/hooks/useImportExport.ts

@@ -78,7 +78,7 @@ export function useImportExport(
     if (!selectedFile) {
       toast.error(
         t("settings.selectFileFailed", {
-          defaultValue: "请选择有效的配置文件",
+          defaultValue: "请选择有效的 SQL 备份文件",
         }),
       );
       return;
@@ -97,7 +97,7 @@ export function useImportExport(
         const message =
           result.message ||
           t("settings.configCorrupted", {
-            defaultValue: "配置文件已损坏或格式不正确",
+            defaultValue: "SQL 文件已损坏或格式不正确",
           });
         setErrorMessage(message);
         toast.error(message);
@@ -150,14 +150,14 @@ export function useImportExport(
 
   const exportConfig = useCallback(async () => {
     try {
-      const defaultName = `cc-switch-config-${
+      const now = new Date();
-        new Date().toISOString().split("T")[0]
+      const stamp = `${now.getFullYear()}${String(now.getMonth() + 1).padStart(2, "0")}${String(now.getDate()).padStart(2, "0")}_${String(now.getHours()).padStart(2, "0")}${String(now.getMinutes()).padStart(2, "0")}${String(now.getSeconds()).padStart(2, "0")}`;
-      }.json`;
+      const defaultName = `cc-switch-export-${stamp}.sql`;
       const destination = await settingsApi.saveFileDialog(defaultName);
       if (!destination) {
         toast.error(
           t("settings.selectFileFailed", {
-            defaultValue: "选择保存位置失败",
+            defaultValue: "请选择 SQL 备份保存路径",
           }),
         );
         return;

src/i18n/locales/en.json

@@ -145,10 +145,10 @@
     "themeLight": "Light",
     "themeDark": "Dark",
     "themeSystem": "System",
-    "importExport": "Import/Export Config",
+    "importExport": "SQL Import/Export",
-    "importExportHint": "Import or export CC Switch configuration for backup or migration.",
+    "importExportHint": "Import or export database SQL backups for migration or restore.",
-    "exportConfig": "Export Config to File",
+    "exportConfig": "Export SQL Backup",
-    "selectConfigFile": "Select Config File",
+    "selectConfigFile": "Select SQL File",
     "noFileSelected": "No configuration file selected.",
     "import": "Import",
     "importing": "Importing...",
@@ -159,8 +159,8 @@
     "importPartialHint": "Please manually reselect the provider to refresh the live configuration.",
     "configExported": "Config exported to:",
     "exportFailed": "Export failed",
-    "selectFileFailed": "Failed to select file",
+    "selectFileFailed": "Please choose a valid SQL backup file",
-    "configCorrupted": "Config file may be corrupted or invalid",
+    "configCorrupted": "SQL file may be corrupted or invalid",
     "backupId": "Backup ID",
     "autoReload": "Data will refresh automatically in 2 seconds...",
     "languageOptionChinese": "中文",
@@ -738,6 +738,12 @@
     },
     "search": "Search Skills",
     "searchPlaceholder": "Search skill name or description...",
+    "filter": {
+      "placeholder": "Filter by status",
+      "all": "All",
+      "installed": "Installed",
+      "uninstalled": "Not installed"
+    },
     "noResults": "No matching skills found"
   },
   "deeplink": {
@@ -748,7 +754,12 @@
     "homepage": "Homepage",
     "endpoint": "API Endpoint",
     "apiKey": "API Key",
+    "icon": "Icon",
     "model": "Model",
+    "haikuModel": "Haiku Model",
+    "sonnetModel": "Sonnet Model",
+    "opusModel": "Opus Model",
+    "multiModel": "Multi-Modal Model",
     "notes": "Notes",
     "import": "Import",
     "importing": "Importing...",

src/i18n/locales/zh.json

@@ -145,10 +145,10 @@
     "themeLight": "浅色",
     "themeDark": "深色",
     "themeSystem": "跟随系统",
-    "importExport": "导入导出配置",
+    "importExport": "SQL 导入导出",
-    "importExportHint": "导入导出 CC Switch 配置，便于备份或迁移。",
+    "importExportHint": "导入/导出数据库 SQL 备份，便于备份或迁移。",
-    "exportConfig": "导出配置到文件",
+    "exportConfig": "导出 SQL 备份",
-    "selectConfigFile": "选择配置文件",
+    "selectConfigFile": "选择 SQL 文件",
     "noFileSelected": "尚未选择配置文件。",
     "import": "导入",
     "importing": "导入中...",
@@ -159,8 +159,8 @@
     "importPartialHint": "请手动重新选择一次供应商以刷新对应配置。",
     "configExported": "配置已导出到：",
     "exportFailed": "导出失败",
-    "selectFileFailed": "选择文件失败",
+    "selectFileFailed": "请选择有效的 SQL 备份文件",
-    "configCorrupted": "配置文件可能已损坏或格式不正确",
+    "configCorrupted": "SQL 文件可能已损坏或格式不正确",
     "backupId": "备份ID",
     "autoReload": "数据将在2秒后自动刷新...",
     "languageOptionChinese": "中文",
@@ -738,6 +738,12 @@
     },
     "search": "搜索技能",
     "searchPlaceholder": "搜索技能名称或描述...",
+    "filter": {
+      "placeholder": "状态筛选",
+      "all": "全部",
+      "installed": "已安装",
+      "uninstalled": "未安装"
+    },
     "noResults": "未找到匹配的技能"
   },
   "deeplink": {
@@ -748,7 +754,12 @@
     "homepage": "官网地址",
     "endpoint": "API 端点",
     "apiKey": "API 密钥",
+    "icon": "图标",
     "model": "模型",
+    "haikuModel": "Haiku 模型",
+    "sonnetModel": "Sonnet 模型",
+    "opusModel": "Opus 模型",
+    "multiModel": "多模态模型",
     "notes": "备注",
     "import": "导入",
     "importing": "导入中...",

src/icons/extracted/metadata.ts

@@ -219,6 +219,13 @@ export const iconMetadata: Record<string, IconMetadata> = {
     keywords: ["gpt", "chatgpt"],
     defaultColor: "#00A67E",
   },
+  packycode: {
+    name: "packycode",
+    displayName: "PackyCode",
+    category: "ai-provider",
+    keywords: ["packycode", "packy", "packyapi"],
+    defaultColor: "currentColor",
+  },
   palm: {
     name: "palm",
     displayName: "palm",

src/lib/api/deeplink.ts

@@ -1,25 +1,66 @@
 import { invoke } from "@tauri-apps/api/core";
 
+export type ResourceType = "provider" | "prompt" | "mcp" | "skill";
+
 export interface DeepLinkImportRequest {
   version: string;
-  resource: string;
+  resource: ResourceType;
-  app: "claude" | "codex" | "gemini";
+
-  name: string;
+  // Common fields
-  homepage: string;
+  app?: "claude" | "codex" | "gemini";
-  endpoint: string;
+  name?: string;
-  apiKey: string;
+  enabled?: boolean;
+
+  // Provider fields
+  homepage?: string;
+  endpoint?: string;
+  apiKey?: string;
+  icon?: string;
   model?: string;
   notes?: string;
-  // Claude 专用模型字段 (v3.7.1+)
   haikuModel?: string;
   sonnetModel?: string;
   opusModel?: string;
-  // 配置文件导入字段 (v3.8+)
+
-  config?: string; // Base64 编码的配置内容
+  // Prompt fields
-  configFormat?: string; // json/toml
+  content?: string;
-  configUrl?: string; // 远程配置 URL
+  description?: string;
+
+  // MCP fields
+  apps?: string; // "claude,codex,gemini"
+
+  // Skill fields
+  repo?: string;
+  directory?: string;
+  branch?: string;
+  skillsPath?: string;
+
+  // Config file fields
+  config?: string;
+  configFormat?: string;
+  configUrl?: string;
 }
 
+export interface McpImportResult {
+  importedCount: number;
+  importedIds: string[];
+  failed: Array<{
+    id: string;
+    error: string;
+  }>;
+}
+
+export type ImportResult =
+  | { type: "provider"; id: string }
+  | { type: "prompt"; id: string }
+  | {
+      type: "mcp";
+      importedCount: number;
+      importedIds: string[];
+      failed: Array<{ id: string; error: string }>;
+    }
+  | { type: "skill"; key: string };
+
 export const deeplinkApi = {
   /**
    * Parse a deep link URL
@@ -43,13 +84,13 @@ export const deeplinkApi = {
   },
 
   /**
-   * Import a provider from a deep link request
+   * Import a resource from a deep link request (unified handler)
    * @param request The deep link import request
-   * @returns The ID of the imported provider
+   * @returns Import result based on resource type
    */
   importFromDeeplink: async (
     request: DeepLinkImportRequest,
-  ): Promise<string> => {
+  ): Promise<ImportResult> => {
-    return invoke("import_from_deeplink", { request });
+    return invoke("import_from_deeplink_unified", { request });
   },
 };

src/lib/utils/base64.ts

@@ -0,0 +1,43 @@
+/**
+ * Decode Base64 encoded UTF-8 string
+ *
+ * This function handles various Base64 edge cases that can occur when
+ * Base64 strings are passed through URLs:
+ * - Spaces (URL parsing may convert '+' to space)
+ * - Missing padding ('=' characters)
+ * - Different Base64 variants
+ *
+ * @param str - Base64 encoded string
+ * @returns Decoded UTF-8 string
+ */
+export function decodeBase64Utf8(str: string): string {
+  try {
+    // Clean up the input: replace spaces with + (URL parsing may convert + to space)
+    let cleaned = str.trim().replace(/ /g, "+");
+
+    // Try to decode with standard Base64 first
+    try {
+      const binString = atob(cleaned);
+      const bytes = Uint8Array.from(binString, (m) => m.codePointAt(0)!);
+      return new TextDecoder("utf-8", { fatal: false }).decode(bytes);
+    } catch (e1) {
+      // If standard fails, try adding padding
+      const remainder = cleaned.length % 4;
+      if (remainder !== 0) {
+        cleaned += "=".repeat(4 - remainder);
+      }
+      const binString = atob(cleaned);
+      const bytes = Uint8Array.from(binString, (m) => m.codePointAt(0)!);
+      return new TextDecoder("utf-8", { fatal: false }).decode(bytes);
+    }
+  } catch (e) {
+    console.error("Base64 decode error:", e, "Input:", str);
+    // Last resort fallback using deprecated but sometimes working method
+    try {
+      return decodeURIComponent(escape(atob(str.replace(/ /g, "+"))));
+    } catch {
+      // If all else fails, return original string
+      return str;
+    }
+  }
+}