feat(mcp): use project config as SSOT and sync enabled servers to ~/.claude.json
- Add McpConfig to MultiAppConfig and persist MCP servers in ~/.cc-switch/config.json - Add Tauri commands: get_mcp_config, upsert_mcp_server_in_config, delete_mcp_server_in_config, set_mcp_enabled, sync_enabled_mcp_to_claude, import_mcp_from_claude - Only write enabled MCPs to ~/.claude.json (mcpServers) and strip UI-only fields (enabled/source) - Frontend: update API wrappers and MCP panel to read/write via config.json; seed presets on first open; import from ~/.claude.json - Fix warnings (remove unused mut, dead code) - Verified with cargo check and pnpm typecheck
This commit is contained in:
139
src-tauri/src/mcp.rs
Normal file
139
src-tauri/src/mcp.rs
Normal file
@@ -0,0 +1,139 @@
|
||||
use serde_json::{json, Value};
|
||||
use std::collections::HashMap;
|
||||
|
||||
use crate::app_config::{McpConfig, MultiAppConfig};
|
||||
|
||||
/// 基础校验:type 必须是 stdio/http;对应必填字段存在
|
||||
fn validate_mcp_spec(spec: &Value) -> Result<(), String> {
|
||||
if !spec.is_object() {
|
||||
return Err("MCP 服务器定义必须为 JSON 对象".into());
|
||||
}
|
||||
let t = spec.get("type").and_then(|x| x.as_str()).unwrap_or("");
|
||||
if t != "stdio" && t != "http" {
|
||||
return Err("MCP 服务器 type 必须是 'stdio' 或 'http'".into());
|
||||
}
|
||||
if t == "stdio" {
|
||||
let cmd = spec.get("command").and_then(|x| x.as_str()).unwrap_or("");
|
||||
if cmd.trim().is_empty() {
|
||||
return Err("stdio 类型的 MCP 服务器缺少 command 字段".into());
|
||||
}
|
||||
}
|
||||
if t == "http" {
|
||||
let url = spec.get("url").and_then(|x| x.as_str()).unwrap_or("");
|
||||
if url.trim().is_empty() {
|
||||
return Err("http 类型的 MCP 服务器缺少 url 字段".into());
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 返回已启用的 MCP 服务器(过滤 enabled==true)
|
||||
fn collect_enabled_servers(cfg: &McpConfig) -> HashMap<String, Value> {
|
||||
let mut out = HashMap::new();
|
||||
for (id, spec) in cfg.servers.iter() {
|
||||
let enabled = spec
|
||||
.get("enabled")
|
||||
.and_then(|v| v.as_bool())
|
||||
.unwrap_or(false);
|
||||
if enabled {
|
||||
out.insert(id.clone(), spec.clone());
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
pub fn get_servers_snapshot(config: &MultiAppConfig) -> HashMap<String, Value> {
|
||||
config.mcp.servers.clone()
|
||||
}
|
||||
|
||||
pub fn upsert_in_config(config: &mut MultiAppConfig, id: &str, spec: Value) -> Result<bool, String> {
|
||||
if id.trim().is_empty() {
|
||||
return Err("MCP 服务器 ID 不能为空".into());
|
||||
}
|
||||
validate_mcp_spec(&spec)?;
|
||||
|
||||
// 默认 enabled 不强制设值;若字段不存在则保持不变(或 UI 决定)
|
||||
if !spec.get("enabled").is_some() {
|
||||
// 缺省不设,以便后续 set_enabled 独立控制
|
||||
}
|
||||
|
||||
let servers = &mut config.mcp_mut().servers;
|
||||
let before = servers.get(id).cloned();
|
||||
servers.insert(id.to_string(), spec);
|
||||
|
||||
Ok(before.is_none())
|
||||
}
|
||||
|
||||
pub fn delete_in_config(config: &mut MultiAppConfig, id: &str) -> Result<bool, String> {
|
||||
if id.trim().is_empty() {
|
||||
return Err("MCP 服务器 ID 不能为空".into());
|
||||
}
|
||||
let existed = config.mcp_mut().servers.remove(id).is_some();
|
||||
Ok(existed)
|
||||
}
|
||||
|
||||
/// 设置启用状态并同步到 ~/.claude.json
|
||||
pub fn set_enabled_and_sync(config: &mut MultiAppConfig, id: &str, enabled: bool) -> Result<bool, String> {
|
||||
if id.trim().is_empty() {
|
||||
return Err("MCP 服务器 ID 不能为空".into());
|
||||
}
|
||||
if let Some(spec) = config.mcp_mut().servers.get_mut(id) {
|
||||
// 写入 enabled 字段
|
||||
let mut obj = spec.as_object().cloned().ok_or_else(|| "MCP 服务器定义必须为 JSON 对象".to_string())?;
|
||||
obj.insert("enabled".into(), json!(enabled));
|
||||
*spec = Value::Object(obj);
|
||||
} else {
|
||||
// 若不存在则直接返回 false
|
||||
return Ok(false);
|
||||
}
|
||||
|
||||
// 同步启用项到 ~/.claude.json
|
||||
sync_enabled_to_claude(config)?;
|
||||
Ok(true)
|
||||
}
|
||||
|
||||
/// 将 config.json 中 enabled==true 的项投影写入 ~/.claude.json
|
||||
pub fn sync_enabled_to_claude(config: &MultiAppConfig) -> Result<(), String> {
|
||||
let enabled = collect_enabled_servers(&config.mcp);
|
||||
crate::claude_mcp::set_mcp_servers_map(&enabled)
|
||||
}
|
||||
|
||||
/// 从 ~/.claude.json 导入 mcpServers 到 config.json(设为 enabled=true)。
|
||||
/// 已存在的项仅强制 enabled=true,不覆盖其他字段。
|
||||
pub fn import_from_claude(config: &mut MultiAppConfig) -> Result<usize, String> {
|
||||
let text_opt = crate::claude_mcp::read_mcp_json()?;
|
||||
let Some(text) = text_opt else { return Ok(0) };
|
||||
let v: Value = serde_json::from_str(&text).map_err(|e| format!("解析 ~/.claude.json 失败: {}", e))?;
|
||||
let Some(map) = v.get("mcpServers").and_then(|x| x.as_object()) else { return Ok(0) };
|
||||
|
||||
let mut changed = 0usize;
|
||||
for (id, spec) in map.iter() {
|
||||
// 校验目标 spec
|
||||
validate_mcp_spec(spec)?;
|
||||
|
||||
// 规范化为对象
|
||||
let mut obj = spec.as_object().cloned().ok_or_else(|| "MCP 服务器定义必须为 JSON 对象".to_string())?;
|
||||
obj.insert("enabled".into(), json!(true));
|
||||
|
||||
let entry = config.mcp_mut().servers.entry(id.clone());
|
||||
use std::collections::hash_map::Entry;
|
||||
match entry {
|
||||
Entry::Vacant(vac) => {
|
||||
vac.insert(Value::Object(obj));
|
||||
changed += 1;
|
||||
}
|
||||
Entry::Occupied(mut occ) => {
|
||||
// 只确保 enabled=true;不覆盖其他字段
|
||||
if let Some(mut existing) = occ.get().as_object().cloned() {
|
||||
let prev = existing.get("enabled").and_then(|b| b.as_bool()).unwrap_or(false);
|
||||
if !prev {
|
||||
existing.insert("enabled".into(), json!(true));
|
||||
occ.insert(Value::Object(existing));
|
||||
changed += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(changed)
|
||||
}
|
||||
Reference in New Issue
Block a user