mirrors/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-05-05 22:01:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): preserve tool_params for elicitations (#14769)

Browse Source 
- [x] Preserve tool_params keys.
This commit is contained in:
Matthew Zeng
2026-03-15 23:15:52 -07:00
committed by GitHub
parent 6fdeb1d602
commit 029aab5563
4 changed files with 92 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
codex-rs/core/src/mcp_tool_approval_templates.rs
View File

@@ -26,6 +26,7 @@ pub(crate) struct RenderedMcpToolApprovalTemplate {
pub(crate) struct RenderedMcpToolApprovalParam {
pub(crate) name: String,
pub(crate) value: Value,
pub(crate) display_name: String,
}
#[derive(Debug, Deserialize)]
@@ -142,8 +143,8 @@ fn render_tool_params(
tool_params: &Map<String, Value>,
template_params: &[ConsequentialToolTemplateParam],
) -> Option<(Option<Value>, Vec<RenderedMcpToolApprovalParam>)> {
let mut relabeled = Map::new();
let mut display_params = Vec::new();
let mut display_names = HashSet::new();
let mut handled_names = HashSet::new();
for template_param in template_params {
@@ -154,12 +155,13 @@ fn render_tool_params(
let Some(value) = tool_params.get(&template_param.name) else {
continue;
};
if relabeled.insert(label.to_string(), value.clone()).is_some() {
if !display_names.insert(label.to_string()) {
return None;
}
display_params.push(RenderedMcpToolApprovalParam {
name: label.to_string(),
name: template_param.name.clone(),
value: value.clone(),
display_name: label.to_string(),
});
handled_names.insert(template_param.name.as_str());
}
@@ -174,16 +176,17 @@ fn render_tool_params(
if handled_names.contains(name.as_str()) {
continue;
}
if relabeled.insert(name.clone(), value.clone()).is_some() {
if !display_names.insert(name.clone()) {
return None;
}
display_params.push(RenderedMcpToolApprovalParam {
name: name.clone(),
value: value.clone(),
display_name: name.clone(),
});
}
Some((Some(Value::Object(relabeled)), display_params))
Some((Some(Value::Object(tool_params.clone())), display_params))
}
#[cfg(test)]
@@ -231,22 +234,25 @@ mod tests {
question: "Allow Calendar to create an event?".to_string(),
elicitation_message: "Allow Calendar to create an event?".to_string(),
tool_params: Some(json!({
"Calendar": "primary",
"Title": "Roadmap review",
"title": "Roadmap review",
"calendar_id": "primary",
"timezone": "UTC",
})),
tool_params_display: vec![
RenderedMcpToolApprovalParam {
name: "Calendar".to_string(),
name: "calendar_id".to_string(),
value: json!("primary"),
display_name: "Calendar".to_string(),
},
RenderedMcpToolApprovalParam {
name: "Title".to_string(),
name: "title".to_string(),
value: json!("Roadmap review"),
display_name: "Title".to_string(),
},
RenderedMcpToolApprovalParam {
name: "timezone".to_string(),
value: json!("UTC"),
display_name: "timezone".to_string(),
},
],
})

1
codex-rs/core/src/mcp_tool_call.rs
View File

@@ -1039,6 +1039,7 @@ fn build_mcp_tool_approval_display_params(
|(name, value)| crate::mcp_tool_approval_templates::RenderedMcpToolApprovalParam {
name: name.clone(),
value: value.clone(),
display_name: name.clone(),
},
)
.collect::<Vec<_>>();

35
codex-rs/core/src/mcp_tool_call_tests.rs
View File

@@ -109,7 +109,7 @@ fn approval_question_text_prepends_safety_reason() {
}
#[tokio::test]
async fn approval_elicitation_request_uses_message_override_and_readable_tool_params() {
async fn approval_elicitation_request_uses_message_override_and_preserves_tool_params_keys() {
let (session, turn_context) = make_session_and_context().await;
let question = build_mcp_tool_approval_question(
"q".to_string(),
@@ -133,10 +133,21 @@ async fn approval_elicitation_request_uses_message_override_and_readable_tool_pa
Some("Create a calendar event."),
)),
tool_params: Some(&serde_json::json!({
"Calendar": "primary",
"Title": "Roadmap review",
"calendar_id": "primary",
"title": "Roadmap review",
})),
tool_params_display: None,
tool_params_display: Some(&[
RenderedMcpToolApprovalParam {
name: "calendar_id".to_string(),
value: serde_json::json!("primary"),
display_name: "Calendar".to_string(),
},
RenderedMcpToolApprovalParam {
name: "title".to_string(),
value: serde_json::json!("Roadmap review"),
display_name: "Title".to_string(),
},
]),
question,
message_override: Some("Allow Calendar to create an event?"),
prompt_options: prompt_options(true, true),
@@ -163,9 +174,21 @@ async fn approval_elicitation_request_uses_message_override_and_readable_tool_pa
MCP_TOOL_APPROVAL_TOOL_TITLE_KEY: "Create Event",
MCP_TOOL_APPROVAL_TOOL_DESCRIPTION_KEY: "Create a calendar event.",
MCP_TOOL_APPROVAL_TOOL_PARAMS_KEY: {
"Calendar": "primary",
"Title": "Roadmap review",
"calendar_id": "primary",
"title": "Roadmap review",
},
MCP_TOOL_APPROVAL_TOOL_PARAMS_DISPLAY_KEY: [
{
"name": "calendar_id",
"value": "primary",
"display_name": "Calendar",
},
{
"name": "title",
"value": "Roadmap review",
"display_name": "Title",
},
],
})),
message: "Allow Calendar to create an event?".to_string(),
requested_schema: McpElicitationSchema {