mirror of
https://github.com/openai/codex.git
synced 2026-05-15 08:42:34 +00:00
## Summary - Add the executor-backed RMCP stdio transport. - Wire MCP stdio placement through the executor environment config. - Cover local and executor-backed stdio paths with the existing MCP test helpers. ## Stack ```text o #18027 [6/6] Fail exec client operations after disconnect │ @ #18212 [5/6] Wire executor-backed MCP stdio │ o #18087 [4/6] Abstract MCP stdio server launching │ o #18020 [3/6] Add pushed exec process events │ o #18086 [2/6] Support piped stdin in exec process API │ o #18085 [1/6] Add MCP server environment config │ o main ``` --------- Co-authored-by: Codex <noreply@openai.com>
73 lines
1.8 KiB
Rust
73 lines
1.8 KiB
Rust
use std::collections::HashMap;
|
|
|
|
pub fn format_env_display<S: AsRef<str>>(
|
|
env: Option<&HashMap<String, String>>,
|
|
env_vars: &[S],
|
|
) -> String {
|
|
let mut parts: Vec<String> = Vec::new();
|
|
|
|
if let Some(map) = env {
|
|
let mut pairs: Vec<_> = map.iter().collect();
|
|
pairs.sort_by(|(a, _), (b, _)| a.cmp(b));
|
|
parts.extend(pairs.into_iter().map(|(key, _)| format!("{key}=*****")));
|
|
}
|
|
|
|
if !env_vars.is_empty() {
|
|
parts.extend(env_vars.iter().map(|var| format!("{}=*****", var.as_ref())));
|
|
}
|
|
|
|
if parts.is_empty() {
|
|
"-".to_string()
|
|
} else {
|
|
parts.join(", ")
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn returns_dash_when_empty() {
|
|
let empty_vars: &[String] = &[];
|
|
assert_eq!(format_env_display(/*env*/ None, empty_vars), "-");
|
|
|
|
let empty_map = HashMap::new();
|
|
assert_eq!(format_env_display(Some(&empty_map), empty_vars), "-");
|
|
}
|
|
|
|
#[test]
|
|
fn formats_sorted_env_pairs() {
|
|
let mut env = HashMap::new();
|
|
env.insert("B".to_string(), "two".to_string());
|
|
env.insert("A".to_string(), "one".to_string());
|
|
|
|
assert_eq!(
|
|
format_env_display(Some(&env), &[] as &[String]),
|
|
"A=*****, B=*****"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn formats_env_vars_with_dollar_prefix() {
|
|
let vars = vec!["TOKEN".to_string(), "PATH".to_string()];
|
|
|
|
assert_eq!(
|
|
format_env_display(/*env*/ None, &vars),
|
|
"TOKEN=*****, PATH=*****"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn combines_env_pairs_and_vars() {
|
|
let mut env = HashMap::new();
|
|
env.insert("HOME".to_string(), "/tmp".to_string());
|
|
let vars = vec!["TOKEN".to_string()];
|
|
|
|
assert_eq!(
|
|
format_env_display(Some(&env), &vars),
|
|
"HOME=*****, TOKEN=*****"
|
|
);
|
|
}
|
|
}
|