openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-16 12:13:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): keep non-app MCP tools visible in apps mode

Browse Source
This commit is contained in:
Karel D'Oosterlinck
2026-02-14 18:37:13 -08:00
parent fce4ad9cf4
commit 2156bd1305
1 changed files with 86 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
codex-rs/core/src/codex.rs
View File

@@ -4722,6 +4722,25 @@ fn filter_codex_apps_mcp_tools(
.collect()
}
fn merge_apps_mode_mcp_tools(
mcp_tools: &HashMap<String, crate::mcp_connection_manager::ToolInfo>,
mut selected_mcp_tools: HashMap<String, crate::mcp_connection_manager::ToolInfo>,
apps_mcp_tools: HashMap<String, crate::mcp_connection_manager::ToolInfo>,
preserve_non_codex_apps_tools: bool,
) -> HashMap<String, crate::mcp_connection_manager::ToolInfo> {
if preserve_non_codex_apps_tools {
// Keep non-codex_apps MCP tools available when there is no explicit MCP tool selection.
for (name, tool) in mcp_tools {
if tool.server_name != CODEX_APPS_MCP_SERVER_NAME {
selected_mcp_tools.insert(name.clone(), tool.clone());
}
}
}
selected_mcp_tools.extend(apps_mcp_tools);
selected_mcp_tools
}
fn codex_apps_connector_id(tool: &crate::mcp_connection_manager::ToolInfo) -> Option<&str> {
tool.connector_id.as_deref()
}
@@ -4902,18 +4921,21 @@ async fn built_tools(
&skill_name_counts_lower,
);
let mut selected_mcp_tools =
if let Some(selected_tools) = sess.get_mcp_tool_selection().await {
filter_mcp_tools_by_name(&mcp_tools, &selected_tools)
} else {
HashMap::new()
};
let selected_tool_names = sess.get_mcp_tool_selection().await;
let selected_mcp_tools = if let Some(selected_tools) = selected_tool_names.as_ref() {
filter_mcp_tools_by_name(&mcp_tools, selected_tools)
} else {
HashMap::new()
};
let apps_mcp_tools =
filter_codex_apps_mcp_tools_only(&mcp_tools, explicitly_enabled.as_ref());
selected_mcp_tools.extend(apps_mcp_tools);
mcp_tools = selected_mcp_tools;
mcp_tools = merge_apps_mode_mcp_tools(
&mcp_tools,
selected_mcp_tools,
apps_mcp_tools,
selected_tool_names.is_none(),
);
}
let app_tools = connectors
@@ -6056,6 +6078,61 @@ mod tests {
);
}
#[test]
fn apps_mode_keeps_non_codex_apps_mcp_tools_without_selection() {
let mcp_tools = HashMap::from([
(
"mcp__codex_apps__calendar_create_event".to_string(),
make_mcp_tool(
CODEX_APPS_MCP_SERVER_NAME,
"calendar_create_event",
Some("calendar"),
Some("Calendar"),
),
),
(
"mcp__rmcp__echo".to_string(),
make_mcp_tool("rmcp", "echo", None, None),
),
]);
let merged = merge_apps_mode_mcp_tools(&mcp_tools, HashMap::new(), HashMap::new(), true);
let mut tool_names: Vec<String> = merged.into_keys().collect();
tool_names.sort();
assert_eq!(tool_names, vec!["mcp__rmcp__echo".to_string()]);
}
#[test]
fn apps_mode_respects_explicit_tool_selection() {
let mcp_tools = HashMap::from([
(
"mcp__codex_apps__calendar_create_event".to_string(),
make_mcp_tool(
CODEX_APPS_MCP_SERVER_NAME,
"calendar_create_event",
Some("calendar"),
Some("Calendar"),
),
),
(
"mcp__rmcp__echo".to_string(),
make_mcp_tool("rmcp", "echo", None, None),
),
]);
let selected = HashMap::from([(
"mcp__codex_apps__calendar_create_event".to_string(),
mcp_tools["mcp__codex_apps__calendar_create_event"].clone(),
)]);
let merged = merge_apps_mode_mcp_tools(&mcp_tools, selected, HashMap::new(), false);
let mut tool_names: Vec<String> = merged.into_keys().collect();
tool_names.sort();
assert_eq!(
tool_names,
vec!["mcp__codex_apps__calendar_create_event".to_string()]
);
}
#[tokio::test]
async fn reconstruct_history_matches_live_compactions() {
let (session, turn_context) = make_session_and_context().await;