init: push source
This commit is contained in:
786
src-tauri/src/commands/mcp.rs
Normal file
786
src-tauri/src/commands/mcp.rs
Normal file
@@ -0,0 +1,786 @@
|
||||
use tauri::AppHandle;
|
||||
use tauri::Manager;
|
||||
use anyhow::{Context, Result};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::HashMap;
|
||||
use std::fs;
|
||||
use std::path::PathBuf;
|
||||
use std::process::Command;
|
||||
use log::{info, error, warn};
|
||||
use dirs;
|
||||
|
||||
/// Helper function to create a std::process::Command with proper environment variables
|
||||
/// This ensures commands like Claude can find Node.js and other dependencies
|
||||
fn create_command_with_env(program: &str) -> Command {
|
||||
let mut cmd = Command::new(program);
|
||||
|
||||
// Inherit essential environment variables from parent process
|
||||
// This is crucial for commands like Claude that need to find Node.js
|
||||
for (key, value) in std::env::vars() {
|
||||
// Pass through PATH and other essential environment variables
|
||||
if key == "PATH" || key == "HOME" || key == "USER"
|
||||
|| key == "SHELL" || key == "LANG" || key == "LC_ALL" || key.starts_with("LC_")
|
||||
|| key == "NODE_PATH" || key == "NVM_DIR" || key == "NVM_BIN"
|
||||
|| key == "HOMEBREW_PREFIX" || key == "HOMEBREW_CELLAR" {
|
||||
log::debug!("Inheriting env var: {}={}", key, value);
|
||||
cmd.env(&key, &value);
|
||||
}
|
||||
}
|
||||
|
||||
cmd
|
||||
}
|
||||
|
||||
/// Finds the full path to the claude binary
|
||||
/// This is necessary because macOS apps have a limited PATH environment
|
||||
fn find_claude_binary(app_handle: &AppHandle) -> Result<String> {
|
||||
log::info!("Searching for claude binary...");
|
||||
|
||||
// First check if we have a stored path in the database
|
||||
if let Ok(app_data_dir) = app_handle.path().app_data_dir() {
|
||||
let db_path = app_data_dir.join("agents.db");
|
||||
if db_path.exists() {
|
||||
if let Ok(conn) = rusqlite::Connection::open(&db_path) {
|
||||
if let Ok(stored_path) = conn.query_row(
|
||||
"SELECT value FROM app_settings WHERE key = 'claude_binary_path'",
|
||||
[],
|
||||
|row| row.get::<_, String>(0),
|
||||
) {
|
||||
log::info!("Found stored claude path in database: {}", stored_path);
|
||||
let path_buf = std::path::PathBuf::from(&stored_path);
|
||||
if path_buf.exists() && path_buf.is_file() {
|
||||
return Ok(stored_path);
|
||||
} else {
|
||||
log::warn!("Stored claude path no longer exists: {}", stored_path);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Common installation paths for claude
|
||||
let mut paths_to_check: Vec<String> = vec![
|
||||
"/usr/local/bin/claude".to_string(),
|
||||
"/opt/homebrew/bin/claude".to_string(),
|
||||
"/usr/bin/claude".to_string(),
|
||||
"/bin/claude".to_string(),
|
||||
];
|
||||
|
||||
// Also check user-specific paths
|
||||
if let Ok(home) = std::env::var("HOME") {
|
||||
paths_to_check.extend(vec![
|
||||
format!("{}/.claude/local/claude", home),
|
||||
format!("{}/.local/bin/claude", home),
|
||||
format!("{}/.npm-global/bin/claude", home),
|
||||
format!("{}/.yarn/bin/claude", home),
|
||||
format!("{}/.bun/bin/claude", home),
|
||||
format!("{}/bin/claude", home),
|
||||
// Check common node_modules locations
|
||||
format!("{}/node_modules/.bin/claude", home),
|
||||
format!("{}/.config/yarn/global/node_modules/.bin/claude", home),
|
||||
]);
|
||||
}
|
||||
|
||||
// Check each path
|
||||
for path in paths_to_check {
|
||||
let path_buf = std::path::PathBuf::from(&path);
|
||||
if path_buf.exists() && path_buf.is_file() {
|
||||
log::info!("Found claude at: {}", path);
|
||||
return Ok(path);
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback: try using 'which' command
|
||||
log::info!("Trying 'which claude' to find binary...");
|
||||
if let Ok(output) = std::process::Command::new("which")
|
||||
.arg("claude")
|
||||
.output()
|
||||
{
|
||||
if output.status.success() {
|
||||
let path = String::from_utf8_lossy(&output.stdout).trim().to_string();
|
||||
if !path.is_empty() {
|
||||
log::info!("'which' found claude at: {}", path);
|
||||
return Ok(path);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Additional fallback: check if claude is in the current PATH
|
||||
// This might work in dev mode
|
||||
if let Ok(output) = std::process::Command::new("claude")
|
||||
.arg("--version")
|
||||
.output()
|
||||
{
|
||||
if output.status.success() {
|
||||
log::info!("claude is available in PATH (dev mode?)");
|
||||
return Ok("claude".to_string());
|
||||
}
|
||||
}
|
||||
|
||||
log::error!("Could not find claude binary in any common location");
|
||||
Err(anyhow::anyhow!("Claude Code not found. Please ensure it's installed and in one of these locations: /usr/local/bin, /opt/homebrew/bin, ~/.claude/local, ~/.local/bin, or in your PATH"))
|
||||
}
|
||||
|
||||
/// Represents an MCP server configuration
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct MCPServer {
|
||||
/// Server name/identifier
|
||||
pub name: String,
|
||||
/// Transport type: "stdio" or "sse"
|
||||
pub transport: String,
|
||||
/// Command to execute (for stdio)
|
||||
pub command: Option<String>,
|
||||
/// Command arguments (for stdio)
|
||||
pub args: Vec<String>,
|
||||
/// Environment variables
|
||||
pub env: HashMap<String, String>,
|
||||
/// URL endpoint (for SSE)
|
||||
pub url: Option<String>,
|
||||
/// Configuration scope: "local", "project", or "user"
|
||||
pub scope: String,
|
||||
/// Whether the server is currently active
|
||||
pub is_active: bool,
|
||||
/// Server status
|
||||
pub status: ServerStatus,
|
||||
}
|
||||
|
||||
/// Server status information
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct ServerStatus {
|
||||
/// Whether the server is running
|
||||
pub running: bool,
|
||||
/// Last error message if any
|
||||
pub error: Option<String>,
|
||||
/// Last checked timestamp
|
||||
pub last_checked: Option<u64>,
|
||||
}
|
||||
|
||||
/// MCP configuration for project scope (.mcp.json)
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct MCPProjectConfig {
|
||||
#[serde(rename = "mcpServers")]
|
||||
pub mcp_servers: HashMap<String, MCPServerConfig>,
|
||||
}
|
||||
|
||||
/// Individual server configuration in .mcp.json
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct MCPServerConfig {
|
||||
pub command: String,
|
||||
#[serde(default)]
|
||||
pub args: Vec<String>,
|
||||
#[serde(default)]
|
||||
pub env: HashMap<String, String>,
|
||||
}
|
||||
|
||||
/// Result of adding a server
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct AddServerResult {
|
||||
pub success: bool,
|
||||
pub message: String,
|
||||
pub server_name: Option<String>,
|
||||
}
|
||||
|
||||
/// Import result for multiple servers
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct ImportResult {
|
||||
pub imported_count: u32,
|
||||
pub failed_count: u32,
|
||||
pub servers: Vec<ImportServerResult>,
|
||||
}
|
||||
|
||||
/// Result for individual server import
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct ImportServerResult {
|
||||
pub name: String,
|
||||
pub success: bool,
|
||||
pub error: Option<String>,
|
||||
}
|
||||
|
||||
/// Executes a claude mcp command
|
||||
fn execute_claude_mcp_command(app_handle: &AppHandle, args: Vec<&str>) -> Result<String> {
|
||||
info!("Executing claude mcp command with args: {:?}", args);
|
||||
|
||||
let claude_path = find_claude_binary(app_handle)?;
|
||||
let mut cmd = create_command_with_env(&claude_path);
|
||||
cmd.arg("mcp");
|
||||
for arg in args {
|
||||
cmd.arg(arg);
|
||||
}
|
||||
|
||||
let output = cmd.output()
|
||||
.context("Failed to execute claude command")?;
|
||||
|
||||
if output.status.success() {
|
||||
Ok(String::from_utf8_lossy(&output.stdout).to_string())
|
||||
} else {
|
||||
let stderr = String::from_utf8_lossy(&output.stderr).to_string();
|
||||
Err(anyhow::anyhow!("Command failed: {}", stderr))
|
||||
}
|
||||
}
|
||||
|
||||
/// Adds a new MCP server
|
||||
#[tauri::command]
|
||||
pub async fn mcp_add(
|
||||
app: AppHandle,
|
||||
name: String,
|
||||
transport: String,
|
||||
command: Option<String>,
|
||||
args: Vec<String>,
|
||||
env: HashMap<String, String>,
|
||||
url: Option<String>,
|
||||
scope: String,
|
||||
) -> Result<AddServerResult, String> {
|
||||
info!("Adding MCP server: {} with transport: {}", name, transport);
|
||||
|
||||
// Prepare owned strings for environment variables
|
||||
let env_args: Vec<String> = env.iter()
|
||||
.map(|(key, value)| format!("{}={}", key, value))
|
||||
.collect();
|
||||
|
||||
let mut cmd_args = vec!["add"];
|
||||
|
||||
// Add scope flag
|
||||
cmd_args.push("-s");
|
||||
cmd_args.push(&scope);
|
||||
|
||||
// Add transport flag for SSE
|
||||
if transport == "sse" {
|
||||
cmd_args.push("--transport");
|
||||
cmd_args.push("sse");
|
||||
}
|
||||
|
||||
// Add environment variables
|
||||
for (i, _) in env.iter().enumerate() {
|
||||
cmd_args.push("-e");
|
||||
cmd_args.push(&env_args[i]);
|
||||
}
|
||||
|
||||
// Add name
|
||||
cmd_args.push(&name);
|
||||
|
||||
// Add command/URL based on transport
|
||||
if transport == "stdio" {
|
||||
if let Some(cmd) = &command {
|
||||
// Add "--" separator before command to prevent argument parsing issues
|
||||
if !args.is_empty() || cmd.contains('-') {
|
||||
cmd_args.push("--");
|
||||
}
|
||||
cmd_args.push(cmd);
|
||||
// Add arguments
|
||||
for arg in &args {
|
||||
cmd_args.push(arg);
|
||||
}
|
||||
} else {
|
||||
return Ok(AddServerResult {
|
||||
success: false,
|
||||
message: "Command is required for stdio transport".to_string(),
|
||||
server_name: None,
|
||||
});
|
||||
}
|
||||
} else if transport == "sse" {
|
||||
if let Some(url_str) = &url {
|
||||
cmd_args.push(url_str);
|
||||
} else {
|
||||
return Ok(AddServerResult {
|
||||
success: false,
|
||||
message: "URL is required for SSE transport".to_string(),
|
||||
server_name: None,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
match execute_claude_mcp_command(&app, cmd_args) {
|
||||
Ok(output) => {
|
||||
info!("Successfully added MCP server: {}", name);
|
||||
Ok(AddServerResult {
|
||||
success: true,
|
||||
message: output.trim().to_string(),
|
||||
server_name: Some(name),
|
||||
})
|
||||
}
|
||||
Err(e) => {
|
||||
error!("Failed to add MCP server: {}", e);
|
||||
Ok(AddServerResult {
|
||||
success: false,
|
||||
message: e.to_string(),
|
||||
server_name: None,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Lists all configured MCP servers
|
||||
#[tauri::command]
|
||||
pub async fn mcp_list(app: AppHandle) -> Result<Vec<MCPServer>, String> {
|
||||
info!("Listing MCP servers");
|
||||
|
||||
match execute_claude_mcp_command(&app, vec!["list"]) {
|
||||
Ok(output) => {
|
||||
info!("Raw output from 'claude mcp list': {:?}", output);
|
||||
let trimmed = output.trim();
|
||||
info!("Trimmed output: {:?}", trimmed);
|
||||
|
||||
// Check if no servers are configured
|
||||
if trimmed.contains("No MCP servers configured") || trimmed.is_empty() {
|
||||
info!("No servers found - empty or 'No MCP servers' message");
|
||||
return Ok(vec![]);
|
||||
}
|
||||
|
||||
// Parse the text output, handling multi-line commands
|
||||
let mut servers = Vec::new();
|
||||
let lines: Vec<&str> = trimmed.lines().collect();
|
||||
info!("Total lines in output: {}", lines.len());
|
||||
for (idx, line) in lines.iter().enumerate() {
|
||||
info!("Line {}: {:?}", idx, line);
|
||||
}
|
||||
|
||||
let mut i = 0;
|
||||
|
||||
while i < lines.len() {
|
||||
let line = lines[i];
|
||||
info!("Processing line {}: {:?}", i, line);
|
||||
|
||||
// Check if this line starts a new server entry
|
||||
if let Some(colon_pos) = line.find(':') {
|
||||
info!("Found colon at position {} in line: {:?}", colon_pos, line);
|
||||
// Make sure this is a server name line (not part of a path)
|
||||
// Server names typically don't contain '/' or '\'
|
||||
let potential_name = line[..colon_pos].trim();
|
||||
info!("Potential server name: {:?}", potential_name);
|
||||
|
||||
if !potential_name.contains('/') && !potential_name.contains('\\') {
|
||||
info!("Valid server name detected: {:?}", potential_name);
|
||||
let name = potential_name.to_string();
|
||||
let mut command_parts = vec![line[colon_pos + 1..].trim().to_string()];
|
||||
info!("Initial command part: {:?}", command_parts[0]);
|
||||
|
||||
// Check if command continues on next lines
|
||||
i += 1;
|
||||
while i < lines.len() {
|
||||
let next_line = lines[i];
|
||||
info!("Checking next line {} for continuation: {:?}", i, next_line);
|
||||
|
||||
// If the next line starts with a server name pattern, break
|
||||
if next_line.contains(':') {
|
||||
let potential_next_name = next_line.split(':').next().unwrap_or("").trim();
|
||||
info!("Found colon in next line, potential name: {:?}", potential_next_name);
|
||||
if !potential_next_name.is_empty() &&
|
||||
!potential_next_name.contains('/') &&
|
||||
!potential_next_name.contains('\\') {
|
||||
info!("Next line is a new server, breaking");
|
||||
break;
|
||||
}
|
||||
}
|
||||
// Otherwise, this line is a continuation of the command
|
||||
info!("Line {} is a continuation", i);
|
||||
command_parts.push(next_line.trim().to_string());
|
||||
i += 1;
|
||||
}
|
||||
|
||||
// Join all command parts
|
||||
let full_command = command_parts.join(" ");
|
||||
info!("Full command for server '{}': {:?}", name, full_command);
|
||||
|
||||
// For now, we'll create a basic server entry
|
||||
servers.push(MCPServer {
|
||||
name: name.clone(),
|
||||
transport: "stdio".to_string(), // Default assumption
|
||||
command: Some(full_command),
|
||||
args: vec![],
|
||||
env: HashMap::new(),
|
||||
url: None,
|
||||
scope: "local".to_string(), // Default assumption
|
||||
is_active: false,
|
||||
status: ServerStatus {
|
||||
running: false,
|
||||
error: None,
|
||||
last_checked: None,
|
||||
},
|
||||
});
|
||||
info!("Added server: {:?}", name);
|
||||
|
||||
continue;
|
||||
} else {
|
||||
info!("Skipping line - name contains path separators");
|
||||
}
|
||||
} else {
|
||||
info!("No colon found in line {}", i);
|
||||
}
|
||||
|
||||
i += 1;
|
||||
}
|
||||
|
||||
info!("Found {} MCP servers total", servers.len());
|
||||
for (idx, server) in servers.iter().enumerate() {
|
||||
info!("Server {}: name='{}', command={:?}", idx, server.name, server.command);
|
||||
}
|
||||
Ok(servers)
|
||||
}
|
||||
Err(e) => {
|
||||
error!("Failed to list MCP servers: {}", e);
|
||||
Err(e.to_string())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Gets details for a specific MCP server
|
||||
#[tauri::command]
|
||||
pub async fn mcp_get(app: AppHandle, name: String) -> Result<MCPServer, String> {
|
||||
info!("Getting MCP server details for: {}", name);
|
||||
|
||||
match execute_claude_mcp_command(&app, vec!["get", &name]) {
|
||||
Ok(output) => {
|
||||
// Parse the structured text output
|
||||
let mut scope = "local".to_string();
|
||||
let mut transport = "stdio".to_string();
|
||||
let mut command = None;
|
||||
let mut args = vec![];
|
||||
let env = HashMap::new();
|
||||
let mut url = None;
|
||||
|
||||
for line in output.lines() {
|
||||
let line = line.trim();
|
||||
|
||||
if line.starts_with("Scope:") {
|
||||
let scope_part = line.replace("Scope:", "").trim().to_string();
|
||||
if scope_part.to_lowercase().contains("local") {
|
||||
scope = "local".to_string();
|
||||
} else if scope_part.to_lowercase().contains("project") {
|
||||
scope = "project".to_string();
|
||||
} else if scope_part.to_lowercase().contains("user") || scope_part.to_lowercase().contains("global") {
|
||||
scope = "user".to_string();
|
||||
}
|
||||
} else if line.starts_with("Type:") {
|
||||
transport = line.replace("Type:", "").trim().to_string();
|
||||
} else if line.starts_with("Command:") {
|
||||
command = Some(line.replace("Command:", "").trim().to_string());
|
||||
} else if line.starts_with("Args:") {
|
||||
let args_str = line.replace("Args:", "").trim().to_string();
|
||||
if !args_str.is_empty() {
|
||||
args = args_str.split_whitespace().map(|s| s.to_string()).collect();
|
||||
}
|
||||
} else if line.starts_with("URL:") {
|
||||
url = Some(line.replace("URL:", "").trim().to_string());
|
||||
} else if line.starts_with("Environment:") {
|
||||
// TODO: Parse environment variables if they're listed
|
||||
// For now, we'll leave it empty
|
||||
}
|
||||
}
|
||||
|
||||
Ok(MCPServer {
|
||||
name,
|
||||
transport,
|
||||
command,
|
||||
args,
|
||||
env,
|
||||
url,
|
||||
scope,
|
||||
is_active: false,
|
||||
status: ServerStatus {
|
||||
running: false,
|
||||
error: None,
|
||||
last_checked: None,
|
||||
},
|
||||
})
|
||||
}
|
||||
Err(e) => {
|
||||
error!("Failed to get MCP server: {}", e);
|
||||
Err(e.to_string())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Removes an MCP server
|
||||
#[tauri::command]
|
||||
pub async fn mcp_remove(app: AppHandle, name: String) -> Result<String, String> {
|
||||
info!("Removing MCP server: {}", name);
|
||||
|
||||
match execute_claude_mcp_command(&app, vec!["remove", &name]) {
|
||||
Ok(output) => {
|
||||
info!("Successfully removed MCP server: {}", name);
|
||||
Ok(output.trim().to_string())
|
||||
}
|
||||
Err(e) => {
|
||||
error!("Failed to remove MCP server: {}", e);
|
||||
Err(e.to_string())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Adds an MCP server from JSON configuration
|
||||
#[tauri::command]
|
||||
pub async fn mcp_add_json(app: AppHandle, name: String, json_config: String, scope: String) -> Result<AddServerResult, String> {
|
||||
info!("Adding MCP server from JSON: {} with scope: {}", name, scope);
|
||||
|
||||
// Build command args
|
||||
let mut cmd_args = vec!["add-json", &name, &json_config];
|
||||
|
||||
// Add scope flag
|
||||
let scope_flag = "-s";
|
||||
cmd_args.push(scope_flag);
|
||||
cmd_args.push(&scope);
|
||||
|
||||
match execute_claude_mcp_command(&app, cmd_args) {
|
||||
Ok(output) => {
|
||||
info!("Successfully added MCP server from JSON: {}", name);
|
||||
Ok(AddServerResult {
|
||||
success: true,
|
||||
message: output.trim().to_string(),
|
||||
server_name: Some(name),
|
||||
})
|
||||
}
|
||||
Err(e) => {
|
||||
error!("Failed to add MCP server from JSON: {}", e);
|
||||
Ok(AddServerResult {
|
||||
success: false,
|
||||
message: e.to_string(),
|
||||
server_name: None,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Imports MCP servers from Claude Desktop
|
||||
#[tauri::command]
|
||||
pub async fn mcp_add_from_claude_desktop(app: AppHandle, scope: String) -> Result<ImportResult, String> {
|
||||
info!("Importing MCP servers from Claude Desktop with scope: {}", scope);
|
||||
|
||||
// Get Claude Desktop config path based on platform
|
||||
let config_path = if cfg!(target_os = "macos") {
|
||||
dirs::home_dir()
|
||||
.ok_or_else(|| "Could not find home directory".to_string())?
|
||||
.join("Library")
|
||||
.join("Application Support")
|
||||
.join("Claude")
|
||||
.join("claude_desktop_config.json")
|
||||
} else if cfg!(target_os = "linux") {
|
||||
// For WSL/Linux, check common locations
|
||||
dirs::config_dir()
|
||||
.ok_or_else(|| "Could not find config directory".to_string())?
|
||||
.join("Claude")
|
||||
.join("claude_desktop_config.json")
|
||||
} else {
|
||||
return Err("Import from Claude Desktop is only supported on macOS and Linux/WSL".to_string());
|
||||
};
|
||||
|
||||
// Check if config file exists
|
||||
if !config_path.exists() {
|
||||
return Err("Claude Desktop configuration not found. Make sure Claude Desktop is installed.".to_string());
|
||||
}
|
||||
|
||||
// Read and parse the config file
|
||||
let config_content = fs::read_to_string(&config_path)
|
||||
.map_err(|e| format!("Failed to read Claude Desktop config: {}", e))?;
|
||||
|
||||
let config: serde_json::Value = serde_json::from_str(&config_content)
|
||||
.map_err(|e| format!("Failed to parse Claude Desktop config: {}", e))?;
|
||||
|
||||
// Extract MCP servers
|
||||
let mcp_servers = config.get("mcpServers")
|
||||
.and_then(|v| v.as_object())
|
||||
.ok_or_else(|| "No MCP servers found in Claude Desktop config".to_string())?;
|
||||
|
||||
let mut imported_count = 0;
|
||||
let mut failed_count = 0;
|
||||
let mut server_results = Vec::new();
|
||||
|
||||
// Import each server using add-json
|
||||
for (name, server_config) in mcp_servers {
|
||||
info!("Importing server: {}", name);
|
||||
|
||||
// Convert Claude Desktop format to add-json format
|
||||
let mut json_config = serde_json::Map::new();
|
||||
|
||||
// All Claude Desktop servers are stdio type
|
||||
json_config.insert("type".to_string(), serde_json::Value::String("stdio".to_string()));
|
||||
|
||||
// Add command
|
||||
if let Some(command) = server_config.get("command").and_then(|v| v.as_str()) {
|
||||
json_config.insert("command".to_string(), serde_json::Value::String(command.to_string()));
|
||||
} else {
|
||||
failed_count += 1;
|
||||
server_results.push(ImportServerResult {
|
||||
name: name.clone(),
|
||||
success: false,
|
||||
error: Some("Missing command field".to_string()),
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
// Add args if present
|
||||
if let Some(args) = server_config.get("args").and_then(|v| v.as_array()) {
|
||||
json_config.insert("args".to_string(), args.clone().into());
|
||||
} else {
|
||||
json_config.insert("args".to_string(), serde_json::Value::Array(vec![]));
|
||||
}
|
||||
|
||||
// Add env if present
|
||||
if let Some(env) = server_config.get("env").and_then(|v| v.as_object()) {
|
||||
json_config.insert("env".to_string(), env.clone().into());
|
||||
} else {
|
||||
json_config.insert("env".to_string(), serde_json::Value::Object(serde_json::Map::new()));
|
||||
}
|
||||
|
||||
// Convert to JSON string
|
||||
let json_str = serde_json::to_string(&json_config)
|
||||
.map_err(|e| format!("Failed to serialize config for {}: {}", name, e))?;
|
||||
|
||||
// Call add-json command
|
||||
match mcp_add_json(app.clone(), name.clone(), json_str, scope.clone()).await {
|
||||
Ok(result) => {
|
||||
if result.success {
|
||||
imported_count += 1;
|
||||
server_results.push(ImportServerResult {
|
||||
name: name.clone(),
|
||||
success: true,
|
||||
error: None,
|
||||
});
|
||||
info!("Successfully imported server: {}", name);
|
||||
} else {
|
||||
failed_count += 1;
|
||||
let error_msg = result.message.clone();
|
||||
server_results.push(ImportServerResult {
|
||||
name: name.clone(),
|
||||
success: false,
|
||||
error: Some(result.message),
|
||||
});
|
||||
error!("Failed to import server {}: {}", name, error_msg);
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
failed_count += 1;
|
||||
let error_msg = e.clone();
|
||||
server_results.push(ImportServerResult {
|
||||
name: name.clone(),
|
||||
success: false,
|
||||
error: Some(e),
|
||||
});
|
||||
error!("Error importing server {}: {}", name, error_msg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
info!("Import complete: {} imported, {} failed", imported_count, failed_count);
|
||||
|
||||
Ok(ImportResult {
|
||||
imported_count,
|
||||
failed_count,
|
||||
servers: server_results,
|
||||
})
|
||||
}
|
||||
|
||||
/// Starts Claude Code as an MCP server
|
||||
#[tauri::command]
|
||||
pub async fn mcp_serve(app: AppHandle) -> Result<String, String> {
|
||||
info!("Starting Claude Code as MCP server");
|
||||
|
||||
// Start the server in a separate process
|
||||
let claude_path = match find_claude_binary(&app) {
|
||||
Ok(path) => path,
|
||||
Err(e) => {
|
||||
error!("Failed to find claude binary: {}", e);
|
||||
return Err(e.to_string());
|
||||
}
|
||||
};
|
||||
|
||||
let mut cmd = create_command_with_env(&claude_path);
|
||||
cmd.arg("mcp").arg("serve");
|
||||
|
||||
match cmd.spawn() {
|
||||
Ok(_) => {
|
||||
info!("Successfully started Claude Code MCP server");
|
||||
Ok("Claude Code MCP server started".to_string())
|
||||
}
|
||||
Err(e) => {
|
||||
error!("Failed to start MCP server: {}", e);
|
||||
Err(e.to_string())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Tests connection to an MCP server
|
||||
#[tauri::command]
|
||||
pub async fn mcp_test_connection(app: AppHandle, name: String) -> Result<String, String> {
|
||||
info!("Testing connection to MCP server: {}", name);
|
||||
|
||||
// For now, we'll use the get command to test if the server exists
|
||||
match execute_claude_mcp_command(&app, vec!["get", &name]) {
|
||||
Ok(_) => Ok(format!("Connection to {} successful", name)),
|
||||
Err(e) => Err(e.to_string()),
|
||||
}
|
||||
}
|
||||
|
||||
/// Resets project-scoped server approval choices
|
||||
#[tauri::command]
|
||||
pub async fn mcp_reset_project_choices(app: AppHandle) -> Result<String, String> {
|
||||
info!("Resetting MCP project choices");
|
||||
|
||||
match execute_claude_mcp_command(&app, vec!["reset-project-choices"]) {
|
||||
Ok(output) => {
|
||||
info!("Successfully reset MCP project choices");
|
||||
Ok(output.trim().to_string())
|
||||
}
|
||||
Err(e) => {
|
||||
error!("Failed to reset project choices: {}", e);
|
||||
Err(e.to_string())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Gets the status of MCP servers
|
||||
#[tauri::command]
|
||||
pub async fn mcp_get_server_status() -> Result<HashMap<String, ServerStatus>, String> {
|
||||
info!("Getting MCP server status");
|
||||
|
||||
// TODO: Implement actual status checking
|
||||
// For now, return empty status
|
||||
Ok(HashMap::new())
|
||||
}
|
||||
|
||||
/// Reads .mcp.json from the current project
|
||||
#[tauri::command]
|
||||
pub async fn mcp_read_project_config(project_path: String) -> Result<MCPProjectConfig, String> {
|
||||
info!("Reading .mcp.json from project: {}", project_path);
|
||||
|
||||
let mcp_json_path = PathBuf::from(&project_path).join(".mcp.json");
|
||||
|
||||
if !mcp_json_path.exists() {
|
||||
return Ok(MCPProjectConfig {
|
||||
mcp_servers: HashMap::new(),
|
||||
});
|
||||
}
|
||||
|
||||
match fs::read_to_string(&mcp_json_path) {
|
||||
Ok(content) => {
|
||||
match serde_json::from_str::<MCPProjectConfig>(&content) {
|
||||
Ok(config) => Ok(config),
|
||||
Err(e) => {
|
||||
error!("Failed to parse .mcp.json: {}", e);
|
||||
Err(format!("Failed to parse .mcp.json: {}", e))
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
error!("Failed to read .mcp.json: {}", e);
|
||||
Err(format!("Failed to read .mcp.json: {}", e))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Saves .mcp.json to the current project
|
||||
#[tauri::command]
|
||||
pub async fn mcp_save_project_config(
|
||||
project_path: String,
|
||||
config: MCPProjectConfig,
|
||||
) -> Result<String, String> {
|
||||
info!("Saving .mcp.json to project: {}", project_path);
|
||||
|
||||
let mcp_json_path = PathBuf::from(&project_path).join(".mcp.json");
|
||||
|
||||
let json_content = serde_json::to_string_pretty(&config)
|
||||
.map_err(|e| format!("Failed to serialize config: {}", e))?;
|
||||
|
||||
fs::write(&mcp_json_path, json_content)
|
||||
.map_err(|e| format!("Failed to write .mcp.json: {}", e))?;
|
||||
|
||||
Ok("Project MCP configuration saved".to_string())
|
||||
}
|
Reference in New Issue
Block a user