Compare commits
65 Commits
main
...
refactor/s
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
09a87c97b8 | ||
|
|
d31531f88b | ||
|
|
ae21754d50 | ||
|
|
7c1f13e4f3 | ||
|
|
fd25c9949f | ||
|
|
6443dc897d | ||
|
|
7aa381cbb7 | ||
|
|
1de3f1b7f8 | ||
|
|
edc71efe4c | ||
|
|
3faf22f1c9 | ||
|
|
0cb8b30f15 | ||
|
|
be1c2ac76e | ||
|
|
e7451bda22 | ||
|
|
5a3420932b | ||
|
|
a2688603fb | ||
|
|
23a407544a | ||
|
|
2b34dc4ec9 | ||
|
|
529051f0e8 | ||
|
|
5d1eed563d | ||
|
|
6e7547ef6e | ||
|
|
f02efbd2b7 | ||
|
|
a39b1d8698 | ||
|
|
86255fe106 | ||
|
|
4acd48adc9 | ||
|
|
d4cd8105d1 | ||
|
|
2b1ae2aa71 | ||
|
|
cf57fbed7b | ||
|
|
eefb764f72 | ||
|
|
4ed3e3bf84 | ||
|
|
99471f6706 | ||
|
|
4210b1547c | ||
|
|
cfee4d6fcc | ||
|
|
24dc628130 | ||
|
|
bf74620051 | ||
|
|
e8d4397b3a | ||
|
|
2b0bc73276 | ||
|
|
939a2e4f2b | ||
|
|
1a89267986 | ||
|
|
127fa5bf9d | ||
|
|
0d4be40c25 | ||
|
|
00720ecf30 | ||
|
|
de7f93d513 | ||
|
|
e7545f8cdf | ||
|
|
838a99b5d2 | ||
|
|
325c6a5f21 | ||
|
|
8824462e4c | ||
|
|
0c1d94e57b | ||
|
|
636a1e2c60 | ||
|
|
a56a578e91 | ||
|
|
c582be265b | ||
|
|
8f218057f3 | ||
|
|
81a6c08673 | ||
|
|
988ea326d9 | ||
|
|
f1b0fa2985 | ||
|
|
3f470de608 | ||
|
|
03af3600b0 | ||
|
|
482b8a1cab | ||
|
|
ddb0b68b4c | ||
|
|
524fa94339 | ||
|
|
162c92144c | ||
|
|
b075ee9fbb | ||
|
|
17cf701bad | ||
|
|
977185e2d5 | ||
|
|
764ba81ea6 | ||
|
|
d802b7bf61 |
71
src-tauri/Cargo.lock
generated
71
src-tauri/Cargo.lock
generated
@@ -39,6 +39,18 @@ dependencies = [
|
|||||||
"version_check",
|
"version_check",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ahash"
|
||||||
|
version = "0.8.12"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"once_cell",
|
||||||
|
"version_check",
|
||||||
|
"zerocopy",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aho-corasick"
|
name = "aho-corasick"
|
||||||
version = "1.1.3"
|
version = "1.1.3"
|
||||||
@@ -614,6 +626,7 @@ dependencies = [
|
|||||||
"chrono",
|
"chrono",
|
||||||
"dirs 5.0.1",
|
"dirs 5.0.1",
|
||||||
"futures",
|
"futures",
|
||||||
|
"indexmap 2.11.4",
|
||||||
"log",
|
"log",
|
||||||
"objc2 0.5.2",
|
"objc2 0.5.2",
|
||||||
"objc2-app-kit 0.2.2",
|
"objc2-app-kit 0.2.2",
|
||||||
@@ -621,6 +634,7 @@ dependencies = [
|
|||||||
"regex",
|
"regex",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
"rquickjs",
|
"rquickjs",
|
||||||
|
"rusqlite",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"serde_yaml",
|
"serde_yaml",
|
||||||
@@ -1275,6 +1289,18 @@ dependencies = [
|
|||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "fallible-iterator"
|
||||||
|
version = "0.3.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "fallible-streaming-iterator"
|
||||||
|
version = "0.1.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "fastrand"
|
name = "fastrand"
|
||||||
version = "2.3.0"
|
version = "2.3.0"
|
||||||
@@ -1813,7 +1839,7 @@ version = "0.12.3"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
|
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash",
|
"ahash 0.7.8",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1821,6 +1847,9 @@ name = "hashbrown"
|
|||||||
version = "0.14.5"
|
version = "0.14.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
|
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
|
||||||
|
dependencies = [
|
||||||
|
"ahash 0.8.12",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hashbrown"
|
name = "hashbrown"
|
||||||
@@ -1828,6 +1857,15 @@ version = "0.16.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
|
checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "hashlink"
|
||||||
|
version = "0.9.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af"
|
||||||
|
dependencies = [
|
||||||
|
"hashbrown 0.14.5",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "heck"
|
name = "heck"
|
||||||
version = "0.4.1"
|
version = "0.4.1"
|
||||||
@@ -2398,6 +2436,17 @@ dependencies = [
|
|||||||
"redox_syscall",
|
"redox_syscall",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "libsqlite3-sys"
|
||||||
|
version = "0.28.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"pkg-config",
|
||||||
|
"vcpkg",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "linux-raw-sys"
|
name = "linux-raw-sys"
|
||||||
version = "0.11.0"
|
version = "0.11.0"
|
||||||
@@ -3849,6 +3898,20 @@ dependencies = [
|
|||||||
"cc",
|
"cc",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rusqlite"
|
||||||
|
version = "0.31.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b838eba278d213a8beaf485bd313fd580ca4505a00d5871caeb1457c55322cae"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags 2.9.4",
|
||||||
|
"fallible-iterator",
|
||||||
|
"fallible-streaming-iterator",
|
||||||
|
"hashlink",
|
||||||
|
"libsqlite3-sys",
|
||||||
|
"smallvec",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rust-ini"
|
name = "rust-ini"
|
||||||
version = "0.21.3"
|
version = "0.21.3"
|
||||||
@@ -5567,6 +5630,12 @@ version = "1.11.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
|
checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "vcpkg"
|
||||||
|
version = "0.2.15"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "version-compare"
|
name = "version-compare"
|
||||||
version = "0.2.0"
|
version = "0.2.0"
|
||||||
|
|||||||
@@ -51,6 +51,8 @@ url = "2.5"
|
|||||||
auto-launch = "0.5"
|
auto-launch = "0.5"
|
||||||
once_cell = "1.21.3"
|
once_cell = "1.21.3"
|
||||||
base64 = "0.22"
|
base64 = "0.22"
|
||||||
|
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]
|
[target.'cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))'.dependencies]
|
||||||
tauri-plugin-single-instance = "2"
|
tauri-plugin-single-instance = "2"
|
||||||
|
|||||||
@@ -494,8 +494,11 @@ impl MultiAppConfig {
|
|||||||
// 创建提示词对象
|
// 创建提示词对象
|
||||||
let timestamp = std::time::SystemTime::now()
|
let timestamp = std::time::SystemTime::now()
|
||||||
.duration_since(std::time::UNIX_EPOCH)
|
.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 id = format!("auto-imported-{timestamp}");
|
||||||
let prompt = crate::prompt::Prompt {
|
let prompt = crate::prompt::Prompt {
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ pub fn get_codex_config_path() -> PathBuf {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 获取 Codex 供应商配置文件路径
|
/// 获取 Codex 供应商配置文件路径
|
||||||
|
#[allow(dead_code)]
|
||||||
pub fn get_codex_provider_paths(
|
pub fn get_codex_provider_paths(
|
||||||
provider_id: &str,
|
provider_id: &str,
|
||||||
provider_name: Option<&str>,
|
provider_name: Option<&str>,
|
||||||
@@ -44,6 +45,7 @@ pub fn get_codex_provider_paths(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 删除 Codex 供应商配置文件
|
/// 删除 Codex 供应商配置文件
|
||||||
|
#[allow(dead_code)]
|
||||||
pub fn delete_codex_provider_config(
|
pub fn delete_codex_provider_config(
|
||||||
provider_id: &str,
|
provider_id: &str,
|
||||||
provider_name: &str,
|
provider_name: &str,
|
||||||
|
|||||||
@@ -141,11 +141,10 @@ pub async fn open_app_config_folder(handle: AppHandle) -> Result<bool, String> {
|
|||||||
pub async fn get_claude_common_config_snippet(
|
pub async fn get_claude_common_config_snippet(
|
||||||
state: tauri::State<'_, crate::store::AppState>,
|
state: tauri::State<'_, crate::store::AppState>,
|
||||||
) -> Result<Option<String>, String> {
|
) -> Result<Option<String>, String> {
|
||||||
let guard = state
|
state
|
||||||
.config
|
.db
|
||||||
.read()
|
.get_config_snippet("claude")
|
||||||
.map_err(|e| format!("读取配置锁失败: {e}"))?;
|
.map_err(|e| e.to_string())
|
||||||
Ok(guard.common_config_snippets.claude.clone())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 设置 Claude 通用配置片段(已废弃,使用 set_common_config_snippet)
|
/// 设置 Claude 通用配置片段(已废弃,使用 set_common_config_snippet)
|
||||||
@@ -154,24 +153,22 @@ pub async fn set_claude_common_config_snippet(
|
|||||||
snippet: String,
|
snippet: String,
|
||||||
state: tauri::State<'_, crate::store::AppState>,
|
state: tauri::State<'_, crate::store::AppState>,
|
||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
let mut guard = state
|
|
||||||
.config
|
|
||||||
.write()
|
|
||||||
.map_err(|e| format!("写入配置锁失败: {e}"))?;
|
|
||||||
|
|
||||||
// 验证是否为有效的 JSON(如果不为空)
|
// 验证是否为有效的 JSON(如果不为空)
|
||||||
if !snippet.trim().is_empty() {
|
if !snippet.trim().is_empty() {
|
||||||
serde_json::from_str::<serde_json::Value>(&snippet)
|
serde_json::from_str::<serde_json::Value>(&snippet)
|
||||||
.map_err(|e| format!("无效的 JSON 格式: {e}"))?;
|
.map_err(|e| format!("无效的 JSON 格式: {e}"))?;
|
||||||
}
|
}
|
||||||
|
|
||||||
guard.common_config_snippets.claude = if snippet.trim().is_empty() {
|
let value = if snippet.trim().is_empty() {
|
||||||
None
|
None
|
||||||
} else {
|
} else {
|
||||||
Some(snippet)
|
Some(snippet)
|
||||||
};
|
};
|
||||||
|
|
||||||
guard.save().map_err(|e| e.to_string())?;
|
state
|
||||||
|
.db
|
||||||
|
.set_config_snippet("claude", value)
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,17 +178,10 @@ pub async fn get_common_config_snippet(
|
|||||||
app_type: String,
|
app_type: String,
|
||||||
state: tauri::State<'_, crate::store::AppState>,
|
state: tauri::State<'_, crate::store::AppState>,
|
||||||
) -> Result<Option<String>, String> {
|
) -> Result<Option<String>, String> {
|
||||||
use crate::app_config::AppType;
|
state
|
||||||
use std::str::FromStr;
|
.db
|
||||||
|
.get_config_snippet(&app_type)
|
||||||
let app = AppType::from_str(&app_type).map_err(|e| format!("无效的应用类型: {e}"))?;
|
.map_err(|e| e.to_string())
|
||||||
|
|
||||||
let guard = state
|
|
||||||
.config
|
|
||||||
.read()
|
|
||||||
.map_err(|e| format!("读取配置锁失败: {e}"))?;
|
|
||||||
|
|
||||||
Ok(guard.common_config_snippets.get(&app).cloned())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 设置通用配置片段(统一接口)
|
/// 设置通用配置片段(统一接口)
|
||||||
@@ -201,40 +191,31 @@ pub async fn set_common_config_snippet(
|
|||||||
snippet: String,
|
snippet: String,
|
||||||
state: tauri::State<'_, crate::store::AppState>,
|
state: tauri::State<'_, crate::store::AppState>,
|
||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
use crate::app_config::AppType;
|
|
||||||
use std::str::FromStr;
|
|
||||||
|
|
||||||
let app = AppType::from_str(&app_type).map_err(|e| format!("无效的应用类型: {e}"))?;
|
|
||||||
|
|
||||||
let mut guard = state
|
|
||||||
.config
|
|
||||||
.write()
|
|
||||||
.map_err(|e| format!("写入配置锁失败: {e}"))?;
|
|
||||||
|
|
||||||
// 验证格式(根据应用类型)
|
// 验证格式(根据应用类型)
|
||||||
if !snippet.trim().is_empty() {
|
if !snippet.trim().is_empty() {
|
||||||
match app {
|
match app_type.as_str() {
|
||||||
AppType::Claude | AppType::Gemini => {
|
"claude" | "gemini" => {
|
||||||
// 验证 JSON 格式
|
// 验证 JSON 格式
|
||||||
serde_json::from_str::<serde_json::Value>(&snippet)
|
serde_json::from_str::<serde_json::Value>(&snippet)
|
||||||
.map_err(|e| format!("无效的 JSON 格式: {e}"))?;
|
.map_err(|e| format!("无效的 JSON 格式: {e}"))?;
|
||||||
}
|
}
|
||||||
AppType::Codex => {
|
"codex" => {
|
||||||
// TOML 格式暂不验证(或可使用 toml crate)
|
// TOML 格式暂不验证(或可使用 toml crate)
|
||||||
// 注意:TOML 验证较为复杂,暂时跳过
|
// 注意:TOML 验证较为复杂,暂时跳过
|
||||||
}
|
}
|
||||||
|
_ => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
guard.common_config_snippets.set(
|
let value = if snippet.trim().is_empty() {
|
||||||
&app,
|
None
|
||||||
if snippet.trim().is_empty() {
|
} else {
|
||||||
None
|
Some(snippet)
|
||||||
} else {
|
};
|
||||||
Some(snippet)
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
guard.save().map_err(|e| e.to_string())?;
|
state
|
||||||
|
.db
|
||||||
|
.set_config_snippet(&app_type, value)
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,20 +6,22 @@ use tauri::State;
|
|||||||
use tauri_plugin_dialog::DialogExt;
|
use tauri_plugin_dialog::DialogExt;
|
||||||
|
|
||||||
use crate::error::AppError;
|
use crate::error::AppError;
|
||||||
use crate::services::ConfigService;
|
use crate::services::provider::ProviderService;
|
||||||
use crate::store::AppState;
|
use crate::store::AppState;
|
||||||
|
|
||||||
/// 导出配置文件
|
/// 导出数据库为 SQL 备份
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn export_config_to_file(
|
pub async fn export_config_to_file(
|
||||||
#[allow(non_snake_case)] filePath: String,
|
#[allow(non_snake_case)] filePath: String,
|
||||||
|
state: State<'_, AppState>,
|
||||||
) -> Result<Value, String> {
|
) -> Result<Value, String> {
|
||||||
|
let db = state.db.clone();
|
||||||
tauri::async_runtime::spawn_blocking(move || {
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
let target_path = PathBuf::from(&filePath);
|
let target_path = PathBuf::from(&filePath);
|
||||||
ConfigService::export_config_to_path(&target_path)?;
|
db.export_sql(&target_path)?;
|
||||||
Ok::<_, AppError>(json!({
|
Ok::<_, AppError>(json!({
|
||||||
"success": true,
|
"success": true,
|
||||||
"message": "Configuration exported successfully",
|
"message": "SQL exported successfully",
|
||||||
"filePath": filePath
|
"filePath": filePath
|
||||||
}))
|
}))
|
||||||
})
|
})
|
||||||
@@ -28,51 +30,49 @@ pub async fn export_config_to_file(
|
|||||||
.map_err(|e: AppError| e.to_string())
|
.map_err(|e: AppError| e.to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 从文件导入配置
|
/// 从 SQL 备份导入数据库
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn import_config_from_file(
|
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> {
|
) -> Result<Value, String> {
|
||||||
let (new_config, backup_id) = tauri::async_runtime::spawn_blocking(move || {
|
let db = state.db.clone();
|
||||||
|
let db_for_state = db.clone();
|
||||||
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
let path_buf = PathBuf::from(&filePath);
|
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
|
.await
|
||||||
.map_err(|e| format!("导入配置失败: {e}"))?
|
.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 文件
|
|
||||||
#[tauri::command]
|
#[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> {
|
||||||
{
|
let db = state.db.clone();
|
||||||
let mut config_state = state
|
tauri::async_runtime::spawn_blocking(move || {
|
||||||
.config
|
let app_state = AppState::new(db);
|
||||||
.write()
|
ProviderService::sync_current_from_db(&app_state)?;
|
||||||
.map_err(|e| AppError::from(e).to_string())?;
|
Ok::<_, AppError>(json!({
|
||||||
ConfigService::sync_current_providers_to_live(&mut config_state)
|
"success": true,
|
||||||
.map_err(|e| e.to_string())?;
|
"message": "Live configuration synchronized"
|
||||||
}
|
}))
|
||||||
|
})
|
||||||
Ok(json!({
|
.await
|
||||||
"success": true,
|
.map_err(|e| format!("同步当前供应商失败: {e}"))?
|
||||||
"message": "Live configuration synchronized"
|
.map_err(|e: AppError| e.to_string())
|
||||||
}))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 保存文件对话框
|
/// 保存文件对话框
|
||||||
@@ -84,7 +84,7 @@ pub async fn save_file_dialog<R: tauri::Runtime>(
|
|||||||
let dialog = app.dialog();
|
let dialog = app.dialog();
|
||||||
let result = dialog
|
let result = dialog
|
||||||
.file()
|
.file()
|
||||||
.add_filter("JSON", &["json"])
|
.add_filter("SQL", &["sql"])
|
||||||
.set_file_name(&defaultName)
|
.set_file_name(&defaultName)
|
||||||
.blocking_save_file();
|
.blocking_save_file();
|
||||||
|
|
||||||
@@ -99,7 +99,7 @@ pub async fn open_file_dialog<R: tauri::Runtime>(
|
|||||||
let dialog = app.dialog();
|
let dialog = app.dialog();
|
||||||
let result = dialog
|
let result = dialog
|
||||||
.file()
|
.file()
|
||||||
.add_filter("JSON", &["json"])
|
.add_filter("SQL", &["sql"])
|
||||||
.blocking_pick_file();
|
.blocking_pick_file();
|
||||||
|
|
||||||
Ok(result.map(|p| p.to_string()))
|
Ok(result.map(|p| p.to_string()))
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#![allow(non_snake_case)]
|
#![allow(non_snake_case)]
|
||||||
|
|
||||||
|
use indexmap::IndexMap;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
@@ -82,12 +83,8 @@ pub async fn upsert_mcp_server_in_config(
|
|||||||
|
|
||||||
// 读取现有的服务器(如果存在)
|
// 读取现有的服务器(如果存在)
|
||||||
let existing_server = {
|
let existing_server = {
|
||||||
let cfg = state.config.read().map_err(|e| e.to_string())?;
|
let servers = state.db.get_all_mcp_servers().map_err(|e| e.to_string())?;
|
||||||
if let Some(servers) = &cfg.mcp.servers {
|
servers.get(&id).cloned()
|
||||||
servers.get(&id).cloned()
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// 构建新的统一服务器结构
|
// 构建新的统一服务器结构
|
||||||
@@ -165,7 +162,7 @@ use crate::app_config::McpServer;
|
|||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn get_mcp_servers(
|
pub async fn get_mcp_servers(
|
||||||
state: State<'_, AppState>,
|
state: State<'_, AppState>,
|
||||||
) -> Result<HashMap<String, McpServer>, String> {
|
) -> Result<IndexMap<String, McpServer>, String> {
|
||||||
McpService::get_all_servers(&state).map_err(|e| e.to_string())
|
McpService::get_all_servers(&state).map_err(|e| e.to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use std::collections::HashMap;
|
use indexmap::IndexMap;
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
|
|
||||||
use tauri::State;
|
use tauri::State;
|
||||||
@@ -12,7 +12,7 @@ use crate::store::AppState;
|
|||||||
pub async fn get_prompts(
|
pub async fn get_prompts(
|
||||||
app: String,
|
app: String,
|
||||||
state: State<'_, AppState>,
|
state: State<'_, AppState>,
|
||||||
) -> Result<HashMap<String, Prompt>, String> {
|
) -> Result<IndexMap<String, Prompt>, String> {
|
||||||
let app_type = AppType::from_str(&app).map_err(|e| e.to_string())?;
|
let app_type = AppType::from_str(&app).map_err(|e| e.to_string())?;
|
||||||
PromptService::get_prompts(&state, app_type).map_err(|e| e.to_string())
|
PromptService::get_prompts(&state, app_type).map_err(|e| e.to_string())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use std::collections::HashMap;
|
use indexmap::IndexMap;
|
||||||
use tauri::State;
|
use tauri::State;
|
||||||
|
|
||||||
use crate::app_config::AppType;
|
use crate::app_config::AppType;
|
||||||
@@ -13,7 +13,7 @@ use std::str::FromStr;
|
|||||||
pub fn get_providers(
|
pub fn get_providers(
|
||||||
state: State<'_, AppState>,
|
state: State<'_, AppState>,
|
||||||
app: String,
|
app: String,
|
||||||
) -> Result<HashMap<String, Provider>, String> {
|
) -> Result<IndexMap<String, Provider>, String> {
|
||||||
let app_type = AppType::from_str(&app).map_err(|e| e.to_string())?;
|
let app_type = AppType::from_str(&app).map_err(|e| e.to_string())?;
|
||||||
ProviderService::list(state.inner(), app_type).map_err(|e| e.to_string())
|
ProviderService::list(state.inner(), app_type).map_err(|e| e.to_string())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,16 +13,34 @@ pub async fn get_skills(
|
|||||||
service: State<'_, SkillServiceState>,
|
service: State<'_, SkillServiceState>,
|
||||||
app_state: State<'_, AppState>,
|
app_state: State<'_, AppState>,
|
||||||
) -> Result<Vec<Skill>, String> {
|
) -> Result<Vec<Skill>, String> {
|
||||||
let repos = {
|
let repos = app_state.db.get_skill_repos().map_err(|e| e.to_string())?;
|
||||||
let config = app_state.config.read().map_err(|e| e.to_string())?;
|
|
||||||
config.skills.repos.clone()
|
|
||||||
};
|
|
||||||
|
|
||||||
service
|
let skills = service
|
||||||
.0
|
.0
|
||||||
.list_skills(repos)
|
.list_skills(repos)
|
||||||
.await
|
.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]
|
#[tauri::command]
|
||||||
@@ -32,10 +50,7 @@ pub async fn install_skill(
|
|||||||
app_state: State<'_, AppState>,
|
app_state: State<'_, AppState>,
|
||||||
) -> Result<bool, String> {
|
) -> Result<bool, String> {
|
||||||
// 先在不持有写锁的情况下收集仓库与技能信息
|
// 先在不持有写锁的情况下收集仓库与技能信息
|
||||||
let repos = {
|
let repos = app_state.db.get_skill_repos().map_err(|e| e.to_string())?;
|
||||||
let config = app_state.config.read().map_err(|e| e.to_string())?;
|
|
||||||
config.skills.repos.clone()
|
|
||||||
};
|
|
||||||
|
|
||||||
let skills = service
|
let skills = service
|
||||||
.0
|
.0
|
||||||
@@ -85,19 +100,16 @@ pub async fn install_skill(
|
|||||||
.map_err(|e| e.to_string())?;
|
.map_err(|e| e.to_string())?;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
app_state
|
||||||
let mut config = app_state.config.write().map_err(|e| e.to_string())?;
|
.db
|
||||||
|
.update_skill_state(
|
||||||
config.skills.skills.insert(
|
&directory,
|
||||||
directory.clone(),
|
&SkillState {
|
||||||
SkillState {
|
|
||||||
installed: true,
|
installed: true,
|
||||||
installed_at: Utc::now(),
|
installed_at: Utc::now(),
|
||||||
},
|
},
|
||||||
);
|
)
|
||||||
}
|
.map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
app_state.save().map_err(|e| e.to_string())?;
|
|
||||||
|
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
@@ -113,13 +125,17 @@ pub fn uninstall_skill(
|
|||||||
.uninstall_skill(directory.clone())
|
.uninstall_skill(directory.clone())
|
||||||
.map_err(|e| e.to_string())?;
|
.map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
{
|
// Remove from database by setting installed = false
|
||||||
let mut config = app_state.config.write().map_err(|e| e.to_string())?;
|
app_state
|
||||||
|
.db
|
||||||
config.skills.skills.remove(&directory);
|
.update_skill_state(
|
||||||
}
|
&directory,
|
||||||
|
&SkillState {
|
||||||
app_state.save().map_err(|e| e.to_string())?;
|
installed: false,
|
||||||
|
installed_at: Utc::now(),
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
@@ -129,28 +145,19 @@ pub fn get_skill_repos(
|
|||||||
_service: State<'_, SkillServiceState>,
|
_service: State<'_, SkillServiceState>,
|
||||||
app_state: State<'_, AppState>,
|
app_state: State<'_, AppState>,
|
||||||
) -> Result<Vec<SkillRepo>, String> {
|
) -> Result<Vec<SkillRepo>, String> {
|
||||||
let config = app_state.config.read().map_err(|e| e.to_string())?;
|
app_state.db.get_skill_repos().map_err(|e| e.to_string())
|
||||||
|
|
||||||
Ok(config.skills.repos.clone())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn add_skill_repo(
|
pub fn add_skill_repo(
|
||||||
repo: SkillRepo,
|
repo: SkillRepo,
|
||||||
service: State<'_, SkillServiceState>,
|
_service: State<'_, SkillServiceState>,
|
||||||
app_state: State<'_, AppState>,
|
app_state: State<'_, AppState>,
|
||||||
) -> Result<bool, String> {
|
) -> Result<bool, String> {
|
||||||
{
|
app_state
|
||||||
let mut config = app_state.config.write().map_err(|e| e.to_string())?;
|
.db
|
||||||
|
.save_skill_repo(&repo)
|
||||||
service
|
.map_err(|e| e.to_string())?;
|
||||||
.0
|
|
||||||
.add_repo(&mut config.skills, repo)
|
|
||||||
.map_err(|e| e.to_string())?;
|
|
||||||
}
|
|
||||||
|
|
||||||
app_state.save().map_err(|e| e.to_string())?;
|
|
||||||
|
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -158,19 +165,12 @@ pub fn add_skill_repo(
|
|||||||
pub fn remove_skill_repo(
|
pub fn remove_skill_repo(
|
||||||
owner: String,
|
owner: String,
|
||||||
name: String,
|
name: String,
|
||||||
service: State<'_, SkillServiceState>,
|
_service: State<'_, SkillServiceState>,
|
||||||
app_state: State<'_, AppState>,
|
app_state: State<'_, AppState>,
|
||||||
) -> Result<bool, String> {
|
) -> Result<bool, String> {
|
||||||
{
|
app_state
|
||||||
let mut config = app_state.config.write().map_err(|e| e.to_string())?;
|
.db
|
||||||
|
.delete_skill_repo(&owner, &name)
|
||||||
service
|
.map_err(|e| e.to_string())?;
|
||||||
.0
|
|
||||||
.remove_repo(&mut config.skills, owner, name)
|
|
||||||
.map_err(|e| e.to_string())?;
|
|
||||||
}
|
|
||||||
|
|
||||||
app_state.save().map_err(|e| e.to_string())?;
|
|
||||||
|
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ pub fn get_app_config_path() -> PathBuf {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 清理供应商名称,确保文件名安全
|
/// 清理供应商名称,确保文件名安全
|
||||||
|
#[allow(dead_code)]
|
||||||
pub fn sanitize_provider_name(name: &str) -> String {
|
pub fn sanitize_provider_name(name: &str) -> String {
|
||||||
name.chars()
|
name.chars()
|
||||||
.map(|c| match c {
|
.map(|c| match c {
|
||||||
@@ -90,6 +91,7 @@ pub fn sanitize_provider_name(name: &str) -> String {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 获取供应商配置文件路径
|
/// 获取供应商配置文件路径
|
||||||
|
#[allow(dead_code)]
|
||||||
pub fn get_provider_config_path(provider_id: &str, provider_name: Option<&str>) -> PathBuf {
|
pub fn get_provider_config_path(provider_id: &str, provider_name: Option<&str>) -> PathBuf {
|
||||||
let base_name = provider_name
|
let base_name = provider_name
|
||||||
.map(sanitize_provider_name)
|
.map(sanitize_provider_name)
|
||||||
|
|||||||
1225
src-tauri/src/database.rs
Normal file
1225
src-tauri/src/database.rs
Normal file
File diff suppressed because it is too large
Load Diff
@@ -50,6 +50,8 @@ pub enum AppError {
|
|||||||
zh: String,
|
zh: String,
|
||||||
en: String,
|
en: String,
|
||||||
},
|
},
|
||||||
|
#[error("数据库错误: {0}")]
|
||||||
|
Database(String),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AppError {
|
impl AppError {
|
||||||
|
|||||||
@@ -13,7 +13,9 @@ fn cell() -> &'static RwLock<Option<InitErrorPayload>> {
|
|||||||
INIT_ERROR.get_or_init(|| RwLock::new(None))
|
INIT_ERROR.get_or_init(|| RwLock::new(None))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
pub fn set_init_error(payload: InitErrorPayload) {
|
pub fn set_init_error(payload: InitErrorPayload) {
|
||||||
|
#[allow(clippy::unwrap_used)]
|
||||||
if let Ok(mut guard) = cell().write() {
|
if let Ok(mut guard) = cell().write() {
|
||||||
*guard = Some(payload);
|
*guard = Some(payload);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ mod claude_plugin;
|
|||||||
mod codex_config;
|
mod codex_config;
|
||||||
mod commands;
|
mod commands;
|
||||||
mod config;
|
mod config;
|
||||||
|
mod database;
|
||||||
mod deeplink;
|
mod deeplink;
|
||||||
mod error;
|
mod error;
|
||||||
mod gemini_config; // 新增
|
mod gemini_config; // 新增
|
||||||
@@ -206,8 +207,6 @@ fn create_tray_menu(
|
|||||||
let app_settings = crate::settings::get_settings();
|
let app_settings = crate::settings::get_settings();
|
||||||
let tray_texts = TrayTexts::from_language(app_settings.language.as_deref().unwrap_or("zh"));
|
let tray_texts = TrayTexts::from_language(app_settings.language.as_deref().unwrap_or("zh"));
|
||||||
|
|
||||||
let config = app_state.config.read().map_err(AppError::from)?;
|
|
||||||
|
|
||||||
let mut menu_builder = MenuBuilder::new(app);
|
let mut menu_builder = MenuBuilder::new(app);
|
||||||
|
|
||||||
// 顶部:打开主界面
|
// 顶部:打开主界面
|
||||||
@@ -218,13 +217,20 @@ fn create_tray_menu(
|
|||||||
|
|
||||||
// 直接添加所有供应商到主菜单(扁平化结构,更简单可靠)
|
// 直接添加所有供应商到主菜单(扁平化结构,更简单可靠)
|
||||||
for section in TRAY_SECTIONS.iter() {
|
for section in TRAY_SECTIONS.iter() {
|
||||||
menu_builder = append_provider_section(
|
let app_type_str = section.app_type.as_str();
|
||||||
app,
|
let providers = app_state.db.get_all_providers(app_type_str)?;
|
||||||
menu_builder,
|
let current_id = app_state
|
||||||
config.get_manager(§ion.app_type),
|
.db
|
||||||
section,
|
.get_current_provider(app_type_str)?
|
||||||
&tray_texts,
|
.unwrap_or_default();
|
||||||
)?;
|
|
||||||
|
let manager = crate::provider::ProviderManager {
|
||||||
|
providers,
|
||||||
|
current: current_id,
|
||||||
|
};
|
||||||
|
|
||||||
|
menu_builder =
|
||||||
|
append_provider_section(app, menu_builder, Some(&manager), section, &tray_texts)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 分隔符和退出菜单
|
// 分隔符和退出菜单
|
||||||
@@ -489,24 +495,31 @@ pub fn run() {
|
|||||||
use objc2::runtime::AnyObject;
|
use objc2::runtime::AnyObject;
|
||||||
use objc2_app_kit::NSColor;
|
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];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -523,42 +536,157 @@ pub fn run() {
|
|||||||
// 预先刷新 Store 覆盖配置,确保 AppState 初始化时可读取到最新路径
|
// 预先刷新 Store 覆盖配置,确保 AppState 初始化时可读取到最新路径
|
||||||
app_store::refresh_app_config_dir_override(app.handle());
|
app_store::refresh_app_config_dir_override(app.handle());
|
||||||
|
|
||||||
// 初始化应用状态(仅创建一次,并在本函数末尾注入 manage)
|
// 初始化数据库
|
||||||
// 如果配置解析失败,则向前端发送错误事件并提前结束 setup(不落盘、不覆盖配置)。
|
let app_config_dir = crate::config::get_app_config_dir();
|
||||||
let app_state = match AppState::try_new() {
|
let db_path = app_config_dir.join("cc-switch.db");
|
||||||
Ok(state) => state,
|
let json_path = app_config_dir.join("config.json");
|
||||||
Err(err) => {
|
|
||||||
let path = crate::config::get_app_config_path();
|
// Check if migration is needed (DB doesn't exist but JSON does)
|
||||||
let payload_json = serde_json::json!({
|
let migration_needed = !db_path.exists() && json_path.exists();
|
||||||
"path": path.display().to_string(),
|
|
||||||
"error": err.to_string(),
|
let db = match crate::database::Database::init() {
|
||||||
});
|
Ok(db) => Arc::new(db),
|
||||||
// 事件通知(可能早于前端订阅,不保证送达)
|
Err(e) => {
|
||||||
if let Err(e) = app.emit("configLoadError", payload_json) {
|
log::error!("Failed to init database: {e}");
|
||||||
log::error!("发射配置加载错误事件失败: {e}");
|
// 这里的错误处理比较棘手,因为 setup 返回 Result<Box<dyn Error>>
|
||||||
}
|
// 我们暂时记录日志并让应用继续运行(可能会崩溃)或者返回错误
|
||||||
// 同时缓存错误,供前端启动阶段主动拉取
|
return Err(Box::new(e));
|
||||||
crate::init_status::set_init_error(crate::init_status::InitErrorPayload {
|
|
||||||
path: path.display().to_string(),
|
|
||||||
error: err.to_string(),
|
|
||||||
});
|
|
||||||
// 不再继续构建托盘/命令依赖的状态,交由前端提示后退出。
|
|
||||||
return Ok(());
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if migration_needed {
|
||||||
|
log::info!("Starting migration from config.json to SQLite...");
|
||||||
|
match crate::app_config::MultiAppConfig::load() {
|
||||||
|
Ok(config) => {
|
||||||
|
if let Err(e) = db.migrate_from_json(&config) {
|
||||||
|
log::error!("Migration failed: {e}");
|
||||||
|
} else {
|
||||||
|
log::info!("Migration successful");
|
||||||
|
// Optional: Rename config.json
|
||||||
|
// let _ = std::fs::rename(&json_path, json_path.with_extension("json.bak"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => log::error!("Failed to load config.json for migration: {e}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
// 迁移旧的 app_config_dir 配置到 Store
|
||||||
if let Err(e) = app_store::migrate_app_config_dir_from_settings(app.handle()) {
|
if let Err(e) = app_store::migrate_app_config_dir_from_settings(app.handle()) {
|
||||||
log::warn!("迁移 app_config_dir 失败: {e}");
|
log::warn!("迁移 app_config_dir 失败: {e}");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 确保配置结构就绪(已移除旧版本的副本迁移逻辑)
|
|
||||||
{
|
|
||||||
let mut config_guard = app_state.config.write().unwrap();
|
|
||||||
config_guard.ensure_app(&app_config::AppType::Claude);
|
|
||||||
config_guard.ensure_app(&app_config::AppType::Codex);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 启动阶段不再无条件保存,避免意外覆盖用户配置。
|
// 启动阶段不再无条件保存,避免意外覆盖用户配置。
|
||||||
|
|
||||||
// 注册 deep-link URL 处理器(使用正确的 DeepLinkExt API)
|
// 注册 deep-link URL 处理器(使用正确的 DeepLinkExt API)
|
||||||
@@ -611,7 +739,11 @@ pub fn run() {
|
|||||||
.show_menu_on_left_click(true);
|
.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)?;
|
let _tray = tray_builder.build(app)?;
|
||||||
// 将同一个实例注入到全局状态,避免重复创建导致的不一致
|
// 将同一个实例注入到全局状态,避免重复创建导致的不一致
|
||||||
|
|||||||
@@ -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 changed = 0;
|
||||||
let mut errors = Vec::new();
|
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}")))?;
|
.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;
|
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 changed = 0;
|
||||||
let mut errors = Vec::new();
|
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 {
|
for item in arr {
|
||||||
match item {
|
match item {
|
||||||
Value::String(s) => toml_arr.push(s.as_str()),
|
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),
|
Value::Bool(b) => toml_arr.push(*b),
|
||||||
_ => {
|
_ => {
|
||||||
all_same_type = false;
|
all_same_type = false;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
use indexmap::IndexMap;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
@@ -64,7 +65,7 @@ impl Provider {
|
|||||||
/// 供应商管理器
|
/// 供应商管理器
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
|
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
|
||||||
pub struct ProviderManager {
|
pub struct ProviderManager {
|
||||||
pub providers: HashMap<String, Provider>,
|
pub providers: IndexMap<String, Provider>,
|
||||||
pub current: String,
|
pub current: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -154,7 +155,7 @@ pub struct ProviderMeta {
|
|||||||
|
|
||||||
impl ProviderManager {
|
impl ProviderManager {
|
||||||
/// 获取所有供应商
|
/// 获取所有供应商
|
||||||
pub fn get_all_providers(&self) -> &HashMap<String, Provider> {
|
pub fn get_all_providers(&self) -> &IndexMap<String, Provider> {
|
||||||
&self.providers
|
&self.providers
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -109,7 +109,17 @@ impl ConfigService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 将外部配置文件内容加载并写入应用状态。
|
/// 将外部配置文件内容加载并写入应用状态。
|
||||||
pub fn import_config_from_path(file_path: &Path, state: &AppState) -> Result<String, AppError> {
|
/// TODO: 需要重构以使用数据库而不是 JSON 配置
|
||||||
|
pub fn import_config_from_path(
|
||||||
|
_file_path: &Path,
|
||||||
|
_state: &AppState,
|
||||||
|
) -> Result<String, AppError> {
|
||||||
|
// TODO: 实现基于数据库的导入逻辑
|
||||||
|
Err(AppError::Message(
|
||||||
|
"配置导入功能正在重构中,暂时不可用".to_string(),
|
||||||
|
))
|
||||||
|
|
||||||
|
/* 旧的实现,需要重构:
|
||||||
let (new_config, backup_id) = Self::load_config_for_import(file_path)?;
|
let (new_config, backup_id) = Self::load_config_for_import(file_path)?;
|
||||||
|
|
||||||
{
|
{
|
||||||
@@ -118,6 +128,7 @@ impl ConfigService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Ok(backup_id)
|
Ok(backup_id)
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 同步当前供应商到对应的 live 配置。
|
/// 同步当前供应商到对应的 live 配置。
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
|
use indexmap::IndexMap;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use crate::app_config::{AppType, McpServer, MultiAppConfig};
|
use crate::app_config::{AppType, McpServer};
|
||||||
use crate::error::AppError;
|
use crate::error::AppError;
|
||||||
use crate::mcp;
|
use crate::mcp;
|
||||||
use crate::store::AppState;
|
use crate::store::AppState;
|
||||||
@@ -10,40 +11,13 @@ pub struct McpService;
|
|||||||
|
|
||||||
impl McpService {
|
impl McpService {
|
||||||
/// 获取所有 MCP 服务器(统一结构)
|
/// 获取所有 MCP 服务器(统一结构)
|
||||||
pub fn get_all_servers(state: &AppState) -> Result<HashMap<String, McpServer>, AppError> {
|
pub fn get_all_servers(state: &AppState) -> Result<IndexMap<String, McpServer>, AppError> {
|
||||||
let cfg = state.config.read()?;
|
state.db.get_all_mcp_servers()
|
||||||
|
|
||||||
// 如果是新结构,直接返回
|
|
||||||
if let Some(servers) = &cfg.mcp.servers {
|
|
||||||
return Ok(servers.clone());
|
|
||||||
}
|
|
||||||
|
|
||||||
// 理论上不应该走到这里,因为 load 时会自动迁移
|
|
||||||
Err(AppError::localized(
|
|
||||||
"mcp.old_structure",
|
|
||||||
"检测到旧版 MCP 结构,请重启应用完成迁移",
|
|
||||||
"Old MCP structure detected, please restart app to complete migration",
|
|
||||||
))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 添加或更新 MCP 服务器
|
/// 添加或更新 MCP 服务器
|
||||||
pub fn upsert_server(state: &AppState, server: McpServer) -> Result<(), AppError> {
|
pub fn upsert_server(state: &AppState, server: McpServer) -> Result<(), AppError> {
|
||||||
{
|
state.db.save_mcp_server(&server)?;
|
||||||
let mut cfg = state.config.write()?;
|
|
||||||
|
|
||||||
// 确保 servers 字段存在
|
|
||||||
if cfg.mcp.servers.is_none() {
|
|
||||||
cfg.mcp.servers = Some(HashMap::new());
|
|
||||||
}
|
|
||||||
|
|
||||||
let servers = cfg.mcp.servers.as_mut().unwrap();
|
|
||||||
let id = server.id.clone();
|
|
||||||
|
|
||||||
// 插入或更新
|
|
||||||
servers.insert(id, server.clone());
|
|
||||||
}
|
|
||||||
|
|
||||||
state.save()?;
|
|
||||||
|
|
||||||
// 同步到各个启用的应用
|
// 同步到各个启用的应用
|
||||||
Self::sync_server_to_apps(state, &server)?;
|
Self::sync_server_to_apps(state, &server)?;
|
||||||
@@ -53,18 +27,10 @@ impl McpService {
|
|||||||
|
|
||||||
/// 删除 MCP 服务器
|
/// 删除 MCP 服务器
|
||||||
pub fn delete_server(state: &AppState, id: &str) -> Result<bool, AppError> {
|
pub fn delete_server(state: &AppState, id: &str) -> Result<bool, AppError> {
|
||||||
let server = {
|
let server = state.db.get_all_mcp_servers()?.shift_remove(id);
|
||||||
let mut cfg = state.config.write()?;
|
|
||||||
|
|
||||||
if let Some(servers) = &mut cfg.mcp.servers {
|
|
||||||
servers.remove(id)
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if let Some(server) = server {
|
if let Some(server) = server {
|
||||||
state.save()?;
|
state.db.delete_mcp_server(id)?;
|
||||||
|
|
||||||
// 从所有应用的 live 配置中移除
|
// 从所有应用的 live 配置中移除
|
||||||
Self::remove_server_from_all_apps(state, id, &server)?;
|
Self::remove_server_from_all_apps(state, id, &server)?;
|
||||||
@@ -81,27 +47,15 @@ impl McpService {
|
|||||||
app: AppType,
|
app: AppType,
|
||||||
enabled: bool,
|
enabled: bool,
|
||||||
) -> Result<(), AppError> {
|
) -> Result<(), AppError> {
|
||||||
let server = {
|
let mut servers = state.db.get_all_mcp_servers()?;
|
||||||
let mut cfg = state.config.write()?;
|
|
||||||
|
|
||||||
if let Some(servers) = &mut cfg.mcp.servers {
|
if let Some(server) = servers.get_mut(server_id) {
|
||||||
if let Some(server) = servers.get_mut(server_id) {
|
server.apps.set_enabled_for(&app, enabled);
|
||||||
server.apps.set_enabled_for(&app, enabled);
|
state.db.save_mcp_server(server)?;
|
||||||
Some(server.clone())
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
if let Some(server) = server {
|
|
||||||
state.save()?;
|
|
||||||
|
|
||||||
// 同步到对应应用
|
// 同步到对应应用
|
||||||
if enabled {
|
if enabled {
|
||||||
Self::sync_server_to_app(state, &server, &app)?;
|
Self::sync_server_to_app(state, server, &app)?;
|
||||||
} else {
|
} else {
|
||||||
Self::remove_server_from_app(state, server_id, &app)?;
|
Self::remove_server_from_app(state, server_id, &app)?;
|
||||||
}
|
}
|
||||||
@@ -111,11 +65,9 @@ impl McpService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// 将 MCP 服务器同步到所有启用的应用
|
/// 将 MCP 服务器同步到所有启用的应用
|
||||||
fn sync_server_to_apps(state: &AppState, server: &McpServer) -> Result<(), AppError> {
|
fn sync_server_to_apps(_state: &AppState, server: &McpServer) -> Result<(), AppError> {
|
||||||
let cfg = state.config.read()?;
|
|
||||||
|
|
||||||
for app in server.apps.enabled_apps() {
|
for app in server.apps.enabled_apps() {
|
||||||
Self::sync_server_to_app_internal(&cfg, server, &app)?;
|
Self::sync_server_to_app_no_config(server, &app)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -123,28 +75,24 @@ impl McpService {
|
|||||||
|
|
||||||
/// 将 MCP 服务器同步到指定应用
|
/// 将 MCP 服务器同步到指定应用
|
||||||
fn sync_server_to_app(
|
fn sync_server_to_app(
|
||||||
state: &AppState,
|
_state: &AppState,
|
||||||
server: &McpServer,
|
server: &McpServer,
|
||||||
app: &AppType,
|
app: &AppType,
|
||||||
) -> Result<(), AppError> {
|
) -> Result<(), AppError> {
|
||||||
let cfg = state.config.read()?;
|
Self::sync_server_to_app_no_config(server, app)
|
||||||
Self::sync_server_to_app_internal(&cfg, server, app)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn sync_server_to_app_internal(
|
fn sync_server_to_app_no_config(server: &McpServer, app: &AppType) -> Result<(), AppError> {
|
||||||
cfg: &MultiAppConfig,
|
|
||||||
server: &McpServer,
|
|
||||||
app: &AppType,
|
|
||||||
) -> Result<(), AppError> {
|
|
||||||
match app {
|
match app {
|
||||||
AppType::Claude => {
|
AppType::Claude => {
|
||||||
mcp::sync_single_server_to_claude(cfg, &server.id, &server.server)?;
|
mcp::sync_single_server_to_claude(&Default::default(), &server.id, &server.server)?;
|
||||||
}
|
}
|
||||||
AppType::Codex => {
|
AppType::Codex => {
|
||||||
mcp::sync_single_server_to_codex(cfg, &server.id, &server.server)?;
|
// Codex uses TOML format, must use the correct function
|
||||||
|
mcp::sync_single_server_to_codex(&Default::default(), &server.id, &server.server)?;
|
||||||
}
|
}
|
||||||
AppType::Gemini => {
|
AppType::Gemini => {
|
||||||
mcp::sync_single_server_to_gemini(cfg, &server.id, &server.server)?;
|
mcp::sync_single_server_to_gemini(&Default::default(), &server.id, &server.server)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -233,28 +181,67 @@ impl McpService {
|
|||||||
|
|
||||||
/// 从 Claude 导入 MCP(v3.7.0 已更新为统一结构)
|
/// 从 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> {
|
||||||
let mut cfg = state.config.write()?;
|
// 创建临时 MultiAppConfig 用于导入
|
||||||
let count = mcp::import_from_claude(&mut cfg)?;
|
let mut temp_config = crate::app_config::MultiAppConfig::default();
|
||||||
drop(cfg);
|
|
||||||
state.save()?;
|
// 调用原有的导入逻辑(从 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)
|
Ok(count)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 从 Codex 导入 MCP(v3.7.0 已更新为统一结构)
|
/// 从 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> {
|
||||||
let mut cfg = state.config.write()?;
|
// 创建临时 MultiAppConfig 用于导入
|
||||||
let count = mcp::import_from_codex(&mut cfg)?;
|
let mut temp_config = crate::app_config::MultiAppConfig::default();
|
||||||
drop(cfg);
|
|
||||||
state.save()?;
|
// 调用原有的导入逻辑(从 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)
|
Ok(count)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 从 Gemini 导入 MCP(v3.7.0 已更新为统一结构)
|
/// 从 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> {
|
||||||
let mut cfg = state.config.write()?;
|
// 创建临时 MultiAppConfig 用于导入
|
||||||
let count = mcp::import_from_gemini(&mut cfg)?;
|
let mut temp_config = crate::app_config::MultiAppConfig::default();
|
||||||
drop(cfg);
|
|
||||||
state.save()?;
|
// 调用原有的导入逻辑(从 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)
|
Ok(count)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use std::collections::HashMap;
|
use indexmap::IndexMap;
|
||||||
|
|
||||||
use crate::app_config::AppType;
|
use crate::app_config::AppType;
|
||||||
use crate::config::write_text_file;
|
use crate::config::write_text_file;
|
||||||
@@ -7,40 +7,34 @@ use crate::prompt::Prompt;
|
|||||||
use crate::prompt_files::prompt_file_path;
|
use crate::prompt_files::prompt_file_path;
|
||||||
use crate::store::AppState;
|
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;
|
pub struct PromptService;
|
||||||
|
|
||||||
impl PromptService {
|
impl PromptService {
|
||||||
pub fn get_prompts(
|
pub fn get_prompts(
|
||||||
state: &AppState,
|
state: &AppState,
|
||||||
app: AppType,
|
app: AppType,
|
||||||
) -> Result<HashMap<String, Prompt>, AppError> {
|
) -> Result<IndexMap<String, Prompt>, AppError> {
|
||||||
let cfg = state.config.read()?;
|
state.db.get_prompts(app.as_str())
|
||||||
let prompts = match app {
|
|
||||||
AppType::Claude => &cfg.prompts.claude.prompts,
|
|
||||||
AppType::Codex => &cfg.prompts.codex.prompts,
|
|
||||||
AppType::Gemini => &cfg.prompts.gemini.prompts,
|
|
||||||
};
|
|
||||||
Ok(prompts.clone())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn upsert_prompt(
|
pub fn upsert_prompt(
|
||||||
state: &AppState,
|
state: &AppState,
|
||||||
app: AppType,
|
app: AppType,
|
||||||
id: &str,
|
_id: &str,
|
||||||
prompt: Prompt,
|
prompt: Prompt,
|
||||||
) -> Result<(), AppError> {
|
) -> Result<(), AppError> {
|
||||||
// 检查是否为已启用的提示词
|
// 检查是否为已启用的提示词
|
||||||
let is_enabled = prompt.enabled;
|
let is_enabled = prompt.enabled;
|
||||||
|
|
||||||
let mut cfg = state.config.write()?;
|
state.db.save_prompt(app.as_str(), &prompt)?;
|
||||||
let prompts = match app {
|
|
||||||
AppType::Claude => &mut cfg.prompts.claude.prompts,
|
|
||||||
AppType::Codex => &mut cfg.prompts.codex.prompts,
|
|
||||||
AppType::Gemini => &mut cfg.prompts.gemini.prompts,
|
|
||||||
};
|
|
||||||
prompts.insert(id.to_string(), prompt.clone());
|
|
||||||
drop(cfg);
|
|
||||||
state.save()?;
|
|
||||||
|
|
||||||
// 如果是已启用的提示词,同步更新到对应的文件
|
// 如果是已启用的提示词,同步更新到对应的文件
|
||||||
if is_enabled {
|
if is_enabled {
|
||||||
@@ -52,12 +46,7 @@ impl PromptService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn delete_prompt(state: &AppState, app: AppType, id: &str) -> Result<(), AppError> {
|
pub fn delete_prompt(state: &AppState, app: AppType, id: &str) -> Result<(), AppError> {
|
||||||
let mut cfg = state.config.write()?;
|
let prompts = state.db.get_prompts(app.as_str())?;
|
||||||
let prompts = match app {
|
|
||||||
AppType::Claude => &mut cfg.prompts.claude.prompts,
|
|
||||||
AppType::Codex => &mut cfg.prompts.codex.prompts,
|
|
||||||
AppType::Gemini => &mut cfg.prompts.gemini.prompts,
|
|
||||||
};
|
|
||||||
|
|
||||||
if let Some(prompt) = prompts.get(id) {
|
if let Some(prompt) = prompts.get(id) {
|
||||||
if prompt.enabled {
|
if prompt.enabled {
|
||||||
@@ -65,9 +54,7 @@ impl PromptService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
prompts.remove(id);
|
state.db.delete_prompt(app.as_str(), id)?;
|
||||||
drop(cfg);
|
|
||||||
state.save()?;
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -77,12 +64,7 @@ impl PromptService {
|
|||||||
if target_path.exists() {
|
if target_path.exists() {
|
||||||
if let Ok(live_content) = std::fs::read_to_string(&target_path) {
|
if let Ok(live_content) = std::fs::read_to_string(&target_path) {
|
||||||
if !live_content.trim().is_empty() {
|
if !live_content.trim().is_empty() {
|
||||||
let mut cfg = state.config.write()?;
|
let mut prompts = state.db.get_prompts(app.as_str())?;
|
||||||
let prompts = match app {
|
|
||||||
AppType::Claude => &mut cfg.prompts.claude.prompts,
|
|
||||||
AppType::Codex => &mut cfg.prompts.codex.prompts,
|
|
||||||
AppType::Gemini => &mut cfg.prompts.gemini.prompts,
|
|
||||||
};
|
|
||||||
|
|
||||||
// 尝试回填到当前已启用的提示词
|
// 尝试回填到当前已启用的提示词
|
||||||
if let Some((enabled_id, enabled_prompt)) = prompts
|
if let Some((enabled_id, enabled_prompt)) = prompts
|
||||||
@@ -90,15 +72,11 @@ impl PromptService {
|
|||||||
.find(|(_, p)| p.enabled)
|
.find(|(_, p)| p.enabled)
|
||||||
.map(|(id, p)| (id.clone(), p))
|
.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.content = live_content.clone();
|
||||||
enabled_prompt.updated_at = Some(timestamp);
|
enabled_prompt.updated_at = Some(timestamp);
|
||||||
log::info!("回填 live 提示词内容到已启用项: {enabled_id}");
|
log::info!("回填 live 提示词内容到已启用项: {enabled_id}");
|
||||||
drop(cfg); // 释放锁后保存,避免死锁
|
state.db.save_prompt(app.as_str(), enabled_prompt)?;
|
||||||
state.save()?; // 第一次保存:回填后立即持久化
|
|
||||||
} else {
|
} else {
|
||||||
// 没有已启用的提示词,则创建一次备份(避免重复备份)
|
// 没有已启用的提示词,则创建一次备份(避免重复备份)
|
||||||
let content_exists = prompts
|
let content_exists = prompts
|
||||||
@@ -122,13 +100,8 @@ impl PromptService {
|
|||||||
created_at: Some(timestamp),
|
created_at: Some(timestamp),
|
||||||
updated_at: Some(timestamp),
|
updated_at: Some(timestamp),
|
||||||
};
|
};
|
||||||
prompts.insert(backup_id.clone(), backup_prompt);
|
|
||||||
log::info!("回填 live 提示词内容,创建备份: {backup_id}");
|
log::info!("回填 live 提示词内容,创建备份: {backup_id}");
|
||||||
drop(cfg); // 释放锁后保存
|
state.db.save_prompt(app.as_str(), &backup_prompt)?;
|
||||||
state.save()?; // 第一次保存:回填后立即持久化
|
|
||||||
} else {
|
|
||||||
// 即使内容已存在,也无需重复备份;但不需要保存任何更改
|
|
||||||
drop(cfg);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -136,12 +109,7 @@ impl PromptService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 启用目标提示词并写入文件
|
// 启用目标提示词并写入文件
|
||||||
let mut cfg = state.config.write()?;
|
let mut prompts = state.db.get_prompts(app.as_str())?;
|
||||||
let prompts = match app {
|
|
||||||
AppType::Claude => &mut cfg.prompts.claude.prompts,
|
|
||||||
AppType::Codex => &mut cfg.prompts.codex.prompts,
|
|
||||||
AppType::Gemini => &mut cfg.prompts.gemini.prompts,
|
|
||||||
};
|
|
||||||
|
|
||||||
for prompt in prompts.values_mut() {
|
for prompt in prompts.values_mut() {
|
||||||
prompt.enabled = false;
|
prompt.enabled = false;
|
||||||
@@ -150,12 +118,16 @@ impl PromptService {
|
|||||||
if let Some(prompt) = prompts.get_mut(id) {
|
if let Some(prompt) = prompts.get_mut(id) {
|
||||||
prompt.enabled = true;
|
prompt.enabled = true;
|
||||||
write_text_file(&target_path, &prompt.content)?; // 原子写入
|
write_text_file(&target_path, &prompt.content)?; // 原子写入
|
||||||
|
state.db.save_prompt(app.as_str(), prompt)?;
|
||||||
} else {
|
} else {
|
||||||
return Err(AppError::InvalidInput(format!("提示词 {id} 不存在")));
|
return Err(AppError::InvalidInput(format!("提示词 {id} 不存在")));
|
||||||
}
|
}
|
||||||
|
|
||||||
drop(cfg);
|
// Save all prompts to disable others
|
||||||
state.save()?; // 第二次保存:启用目标提示词并写入文件后
|
for (_, prompt) in prompts.iter() {
|
||||||
|
state.db.save_prompt(app.as_str(), prompt)?;
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -168,10 +140,7 @@ impl PromptService {
|
|||||||
|
|
||||||
let content =
|
let content =
|
||||||
std::fs::read_to_string(&file_path).map_err(|e| AppError::io(&file_path, e))?;
|
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 id = format!("imported-{timestamp}");
|
||||||
let prompt = Prompt {
|
let prompt = Prompt {
|
||||||
@@ -200,4 +169,56 @@ impl PromptService {
|
|||||||
std::fs::read_to_string(&file_path).map_err(|e| AppError::io(&file_path, e))?;
|
std::fs::read_to_string(&file_path).map_err(|e| AppError::io(&file_path, e))?;
|
||||||
Ok(Some(content))
|
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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -231,7 +231,12 @@ impl SkillService {
|
|||||||
// 解析技能元数据
|
// 解析技能元数据
|
||||||
match self.parse_skill_metadata(&skill_md) {
|
match self.parse_skill_metadata(&skill_md) {
|
||||||
Ok(meta) => {
|
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)
|
// 构建 README URL(考虑 skillsPath)
|
||||||
let readme_path = if let Some(ref skills_path) = repo.skills_path {
|
let readme_path = if let Some(ref skills_path) = repo.skills_path {
|
||||||
@@ -305,7 +310,12 @@ impl SkillService {
|
|||||||
continue;
|
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;
|
let mut found = false;
|
||||||
|
|||||||
@@ -2,8 +2,9 @@ use serde::{Deserialize, Serialize};
|
|||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use std::sync::{OnceLock, RwLock};
|
use std::sync::{Arc, OnceLock, RwLock};
|
||||||
|
|
||||||
|
use crate::database::Database;
|
||||||
use crate::error::AppError;
|
use crate::error::AppError;
|
||||||
|
|
||||||
/// 自定义端点配置
|
/// 自定义端点配置
|
||||||
@@ -90,8 +91,7 @@ impl Default for AppSettings {
|
|||||||
|
|
||||||
impl AppSettings {
|
impl AppSettings {
|
||||||
fn settings_path() -> PathBuf {
|
fn settings_path() -> PathBuf {
|
||||||
// settings.json 必须使用固定路径,不能被 app_config_dir 覆盖
|
// settings.json 保留用于旧版本迁移和无数据库场景
|
||||||
// 否则会造成循环依赖:读取 settings 需要知道路径,但路径在 settings 中
|
|
||||||
dirs::home_dir()
|
dirs::home_dir()
|
||||||
.expect("无法获取用户主目录")
|
.expect("无法获取用户主目录")
|
||||||
.join(".cc-switch")
|
.join(".cc-switch")
|
||||||
@@ -128,7 +128,7 @@ impl AppSettings {
|
|||||||
.map(|s| s.to_string());
|
.map(|s| s.to_string());
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn load() -> Self {
|
fn load_from_file() -> Self {
|
||||||
let path = Self::settings_path();
|
let path = Self::settings_path();
|
||||||
if let Ok(content) = fs::read_to_string(&path) {
|
if let Ok(content) = fs::read_to_string(&path) {
|
||||||
match serde_json::from_str::<AppSettings>(&content) {
|
match serde_json::from_str::<AppSettings>(&content) {
|
||||||
@@ -149,26 +149,80 @@ impl AppSettings {
|
|||||||
Self::default()
|
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 {
|
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> {
|
pub fn update_settings(mut new_settings: AppSettings) -> Result<(), AppError> {
|
||||||
new_settings.normalize_paths();
|
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("写入设置锁失败");
|
let mut guard = settings_store().write().expect("写入设置锁失败");
|
||||||
*guard = new_settings;
|
*guard = new_settings;
|
||||||
|
|||||||
@@ -1,26 +1,14 @@
|
|||||||
use crate::app_config::MultiAppConfig;
|
use crate::database::Database;
|
||||||
use crate::error::AppError;
|
use std::sync::Arc;
|
||||||
use std::sync::RwLock;
|
|
||||||
|
|
||||||
/// 全局应用状态
|
/// 全局应用状态
|
||||||
pub struct AppState {
|
pub struct AppState {
|
||||||
pub config: RwLock<MultiAppConfig>,
|
pub db: Arc<Database>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AppState {
|
impl AppState {
|
||||||
/// 创建新的应用状态
|
/// 创建新的应用状态
|
||||||
/// 注意:仅在配置成功加载时返回;不会在失败时回退默认值。
|
pub fn new(db: Arc<Database>) -> Self {
|
||||||
pub fn try_new() -> Result<Self, AppError> {
|
Self { db }
|
||||||
let config = MultiAppConfig::load()?;
|
|
||||||
Ok(Self {
|
|
||||||
config: RwLock::new(config),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/// 保存配置到文件
|
|
||||||
pub fn save(&self) -> Result<(), AppError> {
|
|
||||||
let config = self.config.read().map_err(AppError::from)?;
|
|
||||||
|
|
||||||
config.save()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -254,16 +254,65 @@ export function DeepLinkImportDialog() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Model (if present) */}
|
{/* Model Fields - 根据应用类型显示不同的模型字段 */}
|
||||||
{request.model && (
|
{request.app === "claude" ? (
|
||||||
<div className="grid grid-cols-3 items-center gap-4">
|
<>
|
||||||
<div className="font-medium text-sm text-muted-foreground">
|
{/* Claude 四种模型字段 */}
|
||||||
{t("deeplink.model")}
|
{request.haikuModel && (
|
||||||
</div>
|
<div className="grid grid-cols-3 items-center gap-4">
|
||||||
<div className="col-span-2 text-sm font-mono">
|
<div className="font-medium text-sm text-muted-foreground">
|
||||||
{request.model}
|
{t("deeplink.haikuModel")}
|
||||||
</div>
|
</div>
|
||||||
</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>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Notes (if present) */}
|
{/* Notes (if present) */}
|
||||||
|
|||||||
@@ -156,13 +156,14 @@ const UsageFooter: React.FC<UsageFooterProps> = ({
|
|||||||
{t("usage.remaining")}
|
{t("usage.remaining")}
|
||||||
</span>
|
</span>
|
||||||
<span
|
<span
|
||||||
className={`font-semibold tabular-nums ${isExpired
|
className={`font-semibold tabular-nums ${
|
||||||
|
isExpired
|
||||||
? "text-red-500 dark:text-red-400"
|
? "text-red-500 dark:text-red-400"
|
||||||
: firstUsage.remaining <
|
: firstUsage.remaining <
|
||||||
(firstUsage.total || firstUsage.remaining) * 0.1
|
(firstUsage.total || firstUsage.remaining) * 0.1
|
||||||
? "text-orange-500 dark:text-orange-400"
|
? "text-orange-500 dark:text-orange-400"
|
||||||
: "text-green-600 dark:text-green-400"
|
: "text-green-600 dark:text-green-400"
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{firstUsage.remaining.toFixed(2)}
|
{firstUsage.remaining.toFixed(2)}
|
||||||
</span>
|
</span>
|
||||||
@@ -310,12 +311,13 @@ const UsagePlanItem: React.FC<{ data: UsageData }> = ({ data }) => {
|
|||||||
{t("usage.remaining")}
|
{t("usage.remaining")}
|
||||||
</span>
|
</span>
|
||||||
<span
|
<span
|
||||||
className={`font-semibold tabular-nums ${isExpired
|
className={`font-semibold tabular-nums ${
|
||||||
? "text-red-500 dark:text-red-400"
|
isExpired
|
||||||
: remaining < (total || remaining) * 0.1
|
? "text-red-500 dark:text-red-400"
|
||||||
? "text-orange-500 dark:text-orange-400"
|
: remaining < (total || remaining) * 0.1
|
||||||
: "text-green-600 dark:text-green-400"
|
? "text-orange-500 dark:text-orange-400"
|
||||||
}`}
|
: "text-green-600 dark:text-green-400"
|
||||||
|
}`}
|
||||||
>
|
>
|
||||||
{remaining.toFixed(2)}
|
{remaining.toFixed(2)}
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
@@ -78,6 +78,8 @@ export function EditProviderDialog({
|
|||||||
async (values: ProviderFormValues) => {
|
async (values: ProviderFormValues) => {
|
||||||
if (!provider) return;
|
if (!provider) return;
|
||||||
|
|
||||||
|
// 注意:values.settingsConfig 已经是最终的配置字符串
|
||||||
|
// ProviderForm 已经为不同的 app 类型(Claude/Codex/Gemini)正确组装了配置
|
||||||
const parsedConfig = JSON.parse(values.settingsConfig) as Record<
|
const parsedConfig = JSON.parse(values.settingsConfig) as Record<
|
||||||
string,
|
string,
|
||||||
unknown
|
unknown
|
||||||
|
|||||||
@@ -1,7 +1,14 @@
|
|||||||
import { useState, useEffect, forwardRef, useImperativeHandle } from "react";
|
import {
|
||||||
|
useState,
|
||||||
|
useEffect,
|
||||||
|
useMemo,
|
||||||
|
forwardRef,
|
||||||
|
useImperativeHandle,
|
||||||
|
} from "react";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { RefreshCw } from "lucide-react";
|
import { Input } from "@/components/ui/input";
|
||||||
|
import { RefreshCw, Search } from "lucide-react";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
import { SkillCard } from "./SkillCard";
|
import { SkillCard } from "./SkillCard";
|
||||||
import { RepoManagerPanel } from "./RepoManagerPanel";
|
import { RepoManagerPanel } from "./RepoManagerPanel";
|
||||||
@@ -24,6 +31,7 @@ export const SkillsPage = forwardRef<SkillsPageHandle, SkillsPageProps>(
|
|||||||
const [repos, setRepos] = useState<SkillRepo[]>([]);
|
const [repos, setRepos] = useState<SkillRepo[]>([]);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [repoManagerOpen, setRepoManagerOpen] = useState(false);
|
const [repoManagerOpen, setRepoManagerOpen] = useState(false);
|
||||||
|
const [searchQuery, setSearchQuery] = useState("");
|
||||||
|
|
||||||
const loadSkills = async (afterLoad?: (data: Skill[]) => void) => {
|
const loadSkills = async (afterLoad?: (data: Skill[]) => void) => {
|
||||||
try {
|
try {
|
||||||
@@ -111,12 +119,12 @@ export const SkillsPage = forwardRef<SkillsPageHandle, SkillsPageProps>(
|
|||||||
const errorMessage =
|
const errorMessage =
|
||||||
error instanceof Error ? error.message : String(error);
|
error instanceof Error ? error.message : String(error);
|
||||||
|
|
||||||
// 使用错误解析器格式化错误,传入 "skills.uninstallFailed"
|
// 使用错误解析器格式化错误,传入 "skills.uninstallFailed"
|
||||||
const { title, description } = formatSkillError(
|
const { title, description } = formatSkillError(
|
||||||
errorMessage,
|
errorMessage,
|
||||||
t,
|
t,
|
||||||
"skills.uninstallFailed",
|
"skills.uninstallFailed",
|
||||||
);
|
);
|
||||||
|
|
||||||
toast.error(title, {
|
toast.error(title, {
|
||||||
description,
|
description,
|
||||||
@@ -162,6 +170,24 @@ export const SkillsPage = forwardRef<SkillsPageHandle, SkillsPageProps>(
|
|||||||
await Promise.all([loadRepos(), loadSkills()]);
|
await Promise.all([loadRepos(), loadSkills()]);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 过滤技能列表
|
||||||
|
const filteredSkills = useMemo(() => {
|
||||||
|
if (!searchQuery.trim()) return skills;
|
||||||
|
|
||||||
|
const query = searchQuery.toLowerCase();
|
||||||
|
return skills.filter((skill) => {
|
||||||
|
const name = skill.name?.toLowerCase() || "";
|
||||||
|
const description = skill.description?.toLowerCase() || "";
|
||||||
|
const directory = skill.directory?.toLowerCase() || "";
|
||||||
|
|
||||||
|
return (
|
||||||
|
name.includes(query) ||
|
||||||
|
description.includes(query) ||
|
||||||
|
directory.includes(query)
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}, [skills, searchQuery]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col h-full min-h-0 bg-background/50">
|
<div className="flex flex-col h-full min-h-0 bg-background/50">
|
||||||
{/* 顶部操作栏(固定区域)已移除,由 App.tsx 接管 */}
|
{/* 顶部操作栏(固定区域)已移除,由 App.tsx 接管 */}
|
||||||
@@ -190,16 +216,49 @@ export const SkillsPage = forwardRef<SkillsPageHandle, SkillsPageProps>(
|
|||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
|
<>
|
||||||
{skills.map((skill) => (
|
{/* 搜索框 */}
|
||||||
<SkillCard
|
<div className="mb-6">
|
||||||
key={skill.key}
|
<div className="relative">
|
||||||
skill={skill}
|
<Search className="absolute left-3 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
|
||||||
onInstall={handleInstall}
|
<Input
|
||||||
onUninstall={handleUninstall}
|
type="text"
|
||||||
/>
|
placeholder={t("skills.searchPlaceholder")}
|
||||||
))}
|
value={searchQuery}
|
||||||
</div>
|
onChange={(e) => setSearchQuery(e.target.value)}
|
||||||
|
className="pl-9"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{searchQuery && (
|
||||||
|
<p className="mt-2 text-sm text-muted-foreground">
|
||||||
|
{t("skills.count", { count: filteredSkills.length })}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* 技能列表或无结果提示 */}
|
||||||
|
{filteredSkills.length === 0 ? (
|
||||||
|
<div className="flex flex-col items-center justify-center h-48 text-center">
|
||||||
|
<p className="text-lg font-medium text-gray-900 dark:text-gray-100">
|
||||||
|
{t("skills.noResults")}
|
||||||
|
</p>
|
||||||
|
<p className="mt-2 text-sm text-gray-500 dark:text-gray-400">
|
||||||
|
{t("skills.emptyDescription")}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
|
||||||
|
{filteredSkills.map((skill) => (
|
||||||
|
<SkillCard
|
||||||
|
key={skill.key}
|
||||||
|
skill={skill}
|
||||||
|
onInstall={handleInstall}
|
||||||
|
onUninstall={handleUninstall}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ export function useImportExport(
|
|||||||
if (!selectedFile) {
|
if (!selectedFile) {
|
||||||
toast.error(
|
toast.error(
|
||||||
t("settings.selectFileFailed", {
|
t("settings.selectFileFailed", {
|
||||||
defaultValue: "请选择有效的配置文件",
|
defaultValue: "请选择有效的 SQL 备份文件",
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
@@ -97,7 +97,7 @@ export function useImportExport(
|
|||||||
const message =
|
const message =
|
||||||
result.message ||
|
result.message ||
|
||||||
t("settings.configCorrupted", {
|
t("settings.configCorrupted", {
|
||||||
defaultValue: "配置文件已损坏或格式不正确",
|
defaultValue: "SQL 文件已损坏或格式不正确",
|
||||||
});
|
});
|
||||||
setErrorMessage(message);
|
setErrorMessage(message);
|
||||||
toast.error(message);
|
toast.error(message);
|
||||||
@@ -150,14 +150,14 @@ export function useImportExport(
|
|||||||
|
|
||||||
const exportConfig = useCallback(async () => {
|
const exportConfig = useCallback(async () => {
|
||||||
try {
|
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);
|
const destination = await settingsApi.saveFileDialog(defaultName);
|
||||||
if (!destination) {
|
if (!destination) {
|
||||||
toast.error(
|
toast.error(
|
||||||
t("settings.selectFileFailed", {
|
t("settings.selectFileFailed", {
|
||||||
defaultValue: "选择保存位置失败",
|
defaultValue: "请选择 SQL 备份保存路径",
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -145,10 +145,10 @@
|
|||||||
"themeLight": "Light",
|
"themeLight": "Light",
|
||||||
"themeDark": "Dark",
|
"themeDark": "Dark",
|
||||||
"themeSystem": "System",
|
"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.",
|
"noFileSelected": "No configuration file selected.",
|
||||||
"import": "Import",
|
"import": "Import",
|
||||||
"importing": "Importing...",
|
"importing": "Importing...",
|
||||||
@@ -159,8 +159,8 @@
|
|||||||
"importPartialHint": "Please manually reselect the provider to refresh the live configuration.",
|
"importPartialHint": "Please manually reselect the provider to refresh the live configuration.",
|
||||||
"configExported": "Config exported to:",
|
"configExported": "Config exported to:",
|
||||||
"exportFailed": "Export failed",
|
"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",
|
"backupId": "Backup ID",
|
||||||
"autoReload": "Data will refresh automatically in 2 seconds...",
|
"autoReload": "Data will refresh automatically in 2 seconds...",
|
||||||
"languageOptionChinese": "中文",
|
"languageOptionChinese": "中文",
|
||||||
@@ -735,7 +735,10 @@
|
|||||||
"removeSuccess": "Repository {{owner}}/{{name}} removed",
|
"removeSuccess": "Repository {{owner}}/{{name}} removed",
|
||||||
"removeFailed": "Failed to remove",
|
"removeFailed": "Failed to remove",
|
||||||
"skillCount": "{{count}} skills detected"
|
"skillCount": "{{count}} skills detected"
|
||||||
}
|
},
|
||||||
|
"search": "Search Skills",
|
||||||
|
"searchPlaceholder": "Search skill name or description...",
|
||||||
|
"noResults": "No matching skills found"
|
||||||
},
|
},
|
||||||
"deeplink": {
|
"deeplink": {
|
||||||
"confirmImport": "Confirm Import Provider",
|
"confirmImport": "Confirm Import Provider",
|
||||||
@@ -746,6 +749,10 @@
|
|||||||
"endpoint": "API Endpoint",
|
"endpoint": "API Endpoint",
|
||||||
"apiKey": "API Key",
|
"apiKey": "API Key",
|
||||||
"model": "Model",
|
"model": "Model",
|
||||||
|
"haikuModel": "Haiku Model",
|
||||||
|
"sonnetModel": "Sonnet Model",
|
||||||
|
"opusModel": "Opus Model",
|
||||||
|
"multiModel": "Multi-Modal Model",
|
||||||
"notes": "Notes",
|
"notes": "Notes",
|
||||||
"import": "Import",
|
"import": "Import",
|
||||||
"importing": "Importing...",
|
"importing": "Importing...",
|
||||||
|
|||||||
@@ -145,10 +145,10 @@
|
|||||||
"themeLight": "浅色",
|
"themeLight": "浅色",
|
||||||
"themeDark": "深色",
|
"themeDark": "深色",
|
||||||
"themeSystem": "跟随系统",
|
"themeSystem": "跟随系统",
|
||||||
"importExport": "导入导出配置",
|
"importExport": "SQL 导入导出",
|
||||||
"importExportHint": "导入导出 CC Switch 配置,便于备份或迁移。",
|
"importExportHint": "导入/导出数据库 SQL 备份,便于备份或迁移。",
|
||||||
"exportConfig": "导出配置到文件",
|
"exportConfig": "导出 SQL 备份",
|
||||||
"selectConfigFile": "选择配置文件",
|
"selectConfigFile": "选择 SQL 文件",
|
||||||
"noFileSelected": "尚未选择配置文件。",
|
"noFileSelected": "尚未选择配置文件。",
|
||||||
"import": "导入",
|
"import": "导入",
|
||||||
"importing": "导入中...",
|
"importing": "导入中...",
|
||||||
@@ -159,8 +159,8 @@
|
|||||||
"importPartialHint": "请手动重新选择一次供应商以刷新对应配置。",
|
"importPartialHint": "请手动重新选择一次供应商以刷新对应配置。",
|
||||||
"configExported": "配置已导出到:",
|
"configExported": "配置已导出到:",
|
||||||
"exportFailed": "导出失败",
|
"exportFailed": "导出失败",
|
||||||
"selectFileFailed": "选择文件失败",
|
"selectFileFailed": "请选择有效的 SQL 备份文件",
|
||||||
"configCorrupted": "配置文件可能已损坏或格式不正确",
|
"configCorrupted": "SQL 文件可能已损坏或格式不正确",
|
||||||
"backupId": "备份ID",
|
"backupId": "备份ID",
|
||||||
"autoReload": "数据将在2秒后自动刷新...",
|
"autoReload": "数据将在2秒后自动刷新...",
|
||||||
"languageOptionChinese": "中文",
|
"languageOptionChinese": "中文",
|
||||||
@@ -735,7 +735,10 @@
|
|||||||
"removeSuccess": "仓库 {{owner}}/{{name}} 已删除",
|
"removeSuccess": "仓库 {{owner}}/{{name}} 已删除",
|
||||||
"removeFailed": "删除失败",
|
"removeFailed": "删除失败",
|
||||||
"skillCount": "识别到 {{count}} 个技能"
|
"skillCount": "识别到 {{count}} 个技能"
|
||||||
}
|
},
|
||||||
|
"search": "搜索技能",
|
||||||
|
"searchPlaceholder": "搜索技能名称或描述...",
|
||||||
|
"noResults": "未找到匹配的技能"
|
||||||
},
|
},
|
||||||
"deeplink": {
|
"deeplink": {
|
||||||
"confirmImport": "确认导入供应商配置",
|
"confirmImport": "确认导入供应商配置",
|
||||||
@@ -746,6 +749,10 @@
|
|||||||
"endpoint": "API 端点",
|
"endpoint": "API 端点",
|
||||||
"apiKey": "API 密钥",
|
"apiKey": "API 密钥",
|
||||||
"model": "模型",
|
"model": "模型",
|
||||||
|
"haikuModel": "Haiku 模型",
|
||||||
|
"sonnetModel": "Sonnet 模型",
|
||||||
|
"opusModel": "Opus 模型",
|
||||||
|
"multiModel": "多模态模型",
|
||||||
"notes": "备注",
|
"notes": "备注",
|
||||||
"import": "导入",
|
"import": "导入",
|
||||||
"importing": "导入中...",
|
"importing": "导入中...",
|
||||||
|
|||||||
Reference in New Issue
Block a user