Initial public release of Warp.
Repo-Sync-Origin: warpdotdev/warp-internal@12af1d983b
This commit is contained in:
David Stern
@@ -0,0 +1,213 @@
|
||||
use anyhow::Context as _;
|
||||
use serde_json::{Map, Value};
|
||||
use warp_cli::mcp::MCPSpec;
|
||||
|
||||
use crate::ai::mcp::TemplatableMCPServer;
|
||||
|
||||
/// Build the `mcp_servers` map to send to the public ambient-agent API.
|
||||
///
|
||||
/// Returns the unwrapped server map (`{ <server_name>: <server_config>, ... }`).
|
||||
/// If user input includes wrapper shapes like `{ "mcpServers": { ... } }`, we unpack them.
|
||||
///
|
||||
/// Notes:
|
||||
/// - UUID specs are coerced into `{"<uuid>": {"warp_id": "<uuid>"}}`.
|
||||
/// - We do light validation to catch obvious config errors before sending the request.
|
||||
pub(super) fn build_mcp_servers_from_specs(
|
||||
specs: &[MCPSpec],
|
||||
) -> anyhow::Result<Option<Map<String, Value>>> {
|
||||
if specs.is_empty() {
|
||||
return Ok(None);
|
||||
}
|
||||
|
||||
let mut merged = Map::new();
|
||||
|
||||
for spec in specs {
|
||||
match spec {
|
||||
MCPSpec::Uuid(uuid) => {
|
||||
// TODO: Look up and use the real MCP server name from MCP managers instead of using the UUID.
|
||||
let name = uuid.to_string();
|
||||
insert_unique(
|
||||
&mut merged,
|
||||
name.clone(),
|
||||
Value::Object({
|
||||
let mut obj = Map::new();
|
||||
obj.insert("warp_id".to_string(), Value::String(name));
|
||||
obj
|
||||
}),
|
||||
)?;
|
||||
}
|
||||
MCPSpec::Json(json_str) => {
|
||||
let json_str = normalize_mcp_json_for_single_server(json_str)?;
|
||||
let value = parse_json_with_optional_braces(&json_str)?;
|
||||
|
||||
let server_map = TemplatableMCPServer::find_template_map(value)
|
||||
.context("Failed to parse MCP server map")?;
|
||||
|
||||
for (name, config) in server_map {
|
||||
insert_unique(&mut merged, name, config)?;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
validate_mcp_servers(&merged)?;
|
||||
|
||||
if merged.is_empty() {
|
||||
Ok(None)
|
||||
} else {
|
||||
Ok(Some(merged))
|
||||
}
|
||||
}
|
||||
|
||||
fn insert_unique(map: &mut Map<String, Value>, name: String, config: Value) -> anyhow::Result<()> {
|
||||
if map.contains_key(&name) {
|
||||
anyhow::bail!("Duplicate MCP server name '{name}' specified multiple times");
|
||||
}
|
||||
|
||||
map.insert(name, config);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn parse_json_with_optional_braces(input: &str) -> anyhow::Result<Value> {
|
||||
// Some docs don't show curly braces around the json object, so add them if necessary.
|
||||
let json = input.trim();
|
||||
let json = if json.starts_with('{') {
|
||||
json.to_owned()
|
||||
} else {
|
||||
format!("{{{json}}}")
|
||||
};
|
||||
|
||||
serde_json::from_str(&json).with_context(|| "Invalid MCP JSON".to_string())
|
||||
}
|
||||
|
||||
#[cfg(not(target_family = "wasm"))]
|
||||
fn normalize_mcp_json_for_single_server(input: &str) -> anyhow::Result<String> {
|
||||
crate::ai::mcp::parsing::normalize_mcp_json(input)
|
||||
.map_err(|e| anyhow::anyhow!(e))
|
||||
.context("Failed to normalize MCP JSON")
|
||||
}
|
||||
|
||||
// The CLI + ambient-agent API isn’t used in WASM builds, but this module still needs to compile.
|
||||
// Implement the same normalization behavior (single-server shorthand wrap) locally.
|
||||
#[cfg(target_family = "wasm")]
|
||||
fn normalize_mcp_json_for_single_server(input: &str) -> anyhow::Result<String> {
|
||||
let json = input.trim();
|
||||
let json_for_parsing = if json.starts_with('{') {
|
||||
json.to_owned()
|
||||
} else {
|
||||
format!("{{{json}}}")
|
||||
};
|
||||
|
||||
let value: Value =
|
||||
serde_json::from_str(&json_for_parsing).with_context(|| "Invalid MCP JSON".to_string())?;
|
||||
|
||||
let is_single_server = value.get("command").is_some() || value.get("url").is_some();
|
||||
if is_single_server {
|
||||
let name = uuid::Uuid::new_v4().to_string();
|
||||
let mut map = Map::new();
|
||||
map.insert(name, value);
|
||||
Ok(Value::Object(map).to_string())
|
||||
} else {
|
||||
Ok(input.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn validate_mcp_servers(mcp_servers: &Map<String, Value>) -> anyhow::Result<()> {
|
||||
for (name, config) in mcp_servers {
|
||||
validate_server_config(name, config)?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn validate_server_config(server_name: &str, config: &Value) -> anyhow::Result<()> {
|
||||
let obj = config.as_object().ok_or_else(|| {
|
||||
anyhow::anyhow!("MCP server '{server_name}' config must be a JSON object")
|
||||
})?;
|
||||
|
||||
let has_warp_id = obj.contains_key("warp_id");
|
||||
let has_command = obj.contains_key("command");
|
||||
let has_url = obj.contains_key("url");
|
||||
|
||||
let kind_count = usize::from(has_warp_id) + usize::from(has_command) + usize::from(has_url);
|
||||
if kind_count != 1 {
|
||||
anyhow::bail!(
|
||||
"MCP server '{server_name}' must have exactly one of: 'warp_id', 'command', or 'url'"
|
||||
);
|
||||
}
|
||||
|
||||
if has_warp_id {
|
||||
let warp_id = obj.get("warp_id").and_then(Value::as_str).ok_or_else(|| {
|
||||
anyhow::anyhow!("MCP server '{server_name}' field 'warp_id' must be a string")
|
||||
})?;
|
||||
|
||||
uuid::Uuid::parse_str(warp_id).with_context(|| {
|
||||
format!("MCP server '{server_name}' field 'warp_id' must be a UUID")
|
||||
})?;
|
||||
}
|
||||
|
||||
if has_command {
|
||||
let command = obj.get("command").and_then(Value::as_str).ok_or_else(|| {
|
||||
anyhow::anyhow!("MCP server '{server_name}' field 'command' must be a string")
|
||||
})?;
|
||||
|
||||
if command.is_empty() {
|
||||
anyhow::bail!("MCP server '{server_name}' field 'command' must be non-empty");
|
||||
}
|
||||
|
||||
if let Some(args) = obj.get("args") {
|
||||
let args = args.as_array().ok_or_else(|| {
|
||||
anyhow::anyhow!("MCP server '{server_name}' field 'args' must be an array")
|
||||
})?;
|
||||
|
||||
for (idx, arg) in args.iter().enumerate() {
|
||||
if !arg.is_string() {
|
||||
anyhow::bail!(
|
||||
"MCP server '{server_name}' field 'args[{idx}]' must be a string"
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if has_url {
|
||||
let url = obj.get("url").and_then(Value::as_str).ok_or_else(|| {
|
||||
anyhow::anyhow!("MCP server '{server_name}' field 'url' must be a string")
|
||||
})?;
|
||||
|
||||
if url.is_empty() {
|
||||
anyhow::bail!("MCP server '{server_name}' field 'url' must be non-empty");
|
||||
}
|
||||
}
|
||||
|
||||
validate_string_map_field(obj, server_name, "env")?;
|
||||
validate_string_map_field(obj, server_name, "headers")?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn validate_string_map_field(
|
||||
obj: &Map<String, Value>,
|
||||
server_name: &str,
|
||||
field: &str,
|
||||
) -> anyhow::Result<()> {
|
||||
let Some(value) = obj.get(field) else {
|
||||
return Ok(());
|
||||
};
|
||||
|
||||
let map = value.as_object().ok_or_else(|| {
|
||||
anyhow::anyhow!("MCP server '{server_name}' field '{field}' must be an object")
|
||||
})?;
|
||||
|
||||
for (key, value) in map {
|
||||
if !value.is_string() {
|
||||
anyhow::bail!("MCP server '{server_name}' field '{field}.{key}' must be a string");
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
#[path = "mcp_config_tests.rs"]
|
||||
mod tests;
|
||||
Reference in New Issue
Block a user