Skip to content

A self-improving RLM agent for coding workflows and long-running autonomous tasks.

Rust

mcp add: write bearerTokenEnvVar, the key the engine reads (#3760)

ktc61a6acd2277
diff --git a/crates/pa-cli/src/mcp_command.rs b/crates/pa-cli/src/mcp_command.rs
index a0b3af15d1..49ef2bd604 100644
--- a/crates/pa-cli/src/mcp_command.rs
+++ b/crates/pa-cli/src/mcp_command.rs
@@ -38,7 +38,7 @@ fn is_valid_env_name(value: &str) -> bool {
/// A user-configured MCP server entry, matching the TS `McpServerConfig`
/// wire shape (camelCase keys).
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(tag = "type", rename_all = "camelCase")]
+#[serde(tag = "type", rename_all_fields = "camelCase")]
pub enum McpServerConfig {
#[serde(rename = "http")]
Http {
@@ -473,6 +473,34 @@ mod tests {
);
}
+ #[test]
+ fn mcp_add_writes_the_bearer_token_key_the_engine_reads() {
+ let args: Vec<String> = [
+ "x",
+ "--url",
+ "https://e.com/mcp",
+ "--bearer-token-env-var",
+ "MY_TOKEN",
+ ]
+ .map(String::from)
+ .to_vec();
+ let (_, config, _) = parse_mcp_add_args(&args).unwrap();
+ let written = serde_json::to_value(&config).unwrap();
+ assert_eq!(
+ written,
+ serde_json::json!({
+ "type": "http",
+ "url": "https://e.com/mcp",
+ "bearerTokenEnvVar": "MY_TOKEN"
+ })
+ );
+ let engine: pa_core::mcp::McpServerConfig = serde_json::from_value(written).unwrap();
+ assert!(matches!(
+ engine,
+ pa_core::mcp::McpServerConfig::Http { bearer_token_env_var: Some(ref var), .. } if var == "MY_TOKEN"
+ ));
+ }
+
#[test]
fn name_patterns() {
assert!(is_valid_server_name("a"));
diff --git a/crates/pa-core/src/mcp/mod.rs b/crates/pa-core/src/mcp/mod.rs
index fc58e982c5..61129475cc 100644
--- a/crates/pa-core/src/mcp/mod.rs
+++ b/crates/pa-core/src/mcp/mod.rs
@@ -83,6 +83,7 @@ pub enum McpServerConfig {
/// Env var holding a static bearer token (skips OAuth).
#[serde(
rename = "bearerTokenEnvVar",
+ alias = "bearer_token_env_var",
default,
skip_serializing_if = "Option::is_none"
)]
@@ -1045,6 +1046,20 @@ mod tests {
}
}
+ #[test]
+ fn both_bearer_token_env_var_spellings_read() {
+ let expected = http_config("https://e.com/mcp", None, Some("MY_TOKEN"));
+ for key in ["bearerTokenEnvVar", "bearer_token_env_var"] {
+ let parsed: McpServerConfig = serde_json::from_value(serde_json::json!({
+ "type": "http",
+ "url": "https://e.com/mcp",
+ key: "MY_TOKEN"
+ }))
+ .unwrap();
+ assert_eq!(parsed, expected, "{key}");
+ }
+ }
+
#[test]
fn connection_roster_covers_builtins_and_user_servers() {
let mut user_servers = HashMap::new();
diff --git a/crates/pa-core/src/settings/mod.rs b/crates/pa-core/src/settings/mod.rs
index 0a88642793..2e0b380463 100644
--- a/crates/pa-core/src/settings/mod.rs
+++ b/crates/pa-core/src/settings/mod.rs
@@ -16,6 +16,6 @@ pub use storage::{
FileSettingsStorage, InMemorySettingsStorage, SettingsScope, SettingsStorage, CONFIG_DIR_NAME,
};
pub use types::{
- AutoRefineSettings, AutonomousSettings, CompactionSettings, McpServerConfig, QueueModeSetting,
- Settings, ThinkingLevelSetting, TransportSetting, UpdateChannel,
+ AutoRefineSettings, AutonomousSettings, CompactionSettings, QueueModeSetting, Settings,
+ ThinkingLevelSetting, TransportSetting, UpdateChannel,
};
diff --git a/crates/pa-core/src/settings/types.rs b/crates/pa-core/src/settings/types.rs
index ff61907bb7..fdd8cd97cd 100644
--- a/crates/pa-core/src/settings/types.rs
+++ b/crates/pa-core/src/settings/types.rs
@@ -254,50 +254,6 @@ pub struct TelemetrySettings {
pub local_mirror: Option<bool>,
}
-/// User-declared MCP server (settings `mcpServers` entry).
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "kebab-case")]
-pub enum McpServerConfig {
- Http {
- url: String,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- headers: Option<serde_json::Map<String, serde_json::Value>>,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- bearer_token_env_var: Option<String>,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- oauth: Option<bool>,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- enabled: Option<bool>,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- enabled_tools: Option<Vec<String>>,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- disabled_tools: Option<Vec<String>>,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- startup_timeout_ms: Option<u64>,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- call_timeout_ms: Option<u64>,
- },
- Stdio {
- command: String,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- args: Option<Vec<String>>,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- cwd: Option<String>,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- env: Option<serde_json::Map<String, serde_json::Value>>,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- enabled: Option<bool>,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- enabled_tools: Option<Vec<String>>,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- disabled_tools: Option<Vec<String>>,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- startup_timeout_ms: Option<u64>,
- #[serde(default, skip_serializing_if = "Option::is_none")]
- call_timeout_ms: Option<u64>,
- },
-}
-
/// The default per-cell watchdog budget for user `python_repl` cells: 60
/// seconds.
pub const DEFAULT_PYTHON_CELL_TIMEOUT_MS: u64 = 60_000;