openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-09 15:58:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support plugin install entry metadata in TUI

Browse Source
This commit is contained in:
Noah MacCallum
2026-06-17 15:25:07 -07:00
committed by Zhanshi Wang
parent 38211a3ff8
commit 08604af9f3
1 changed files with 61 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
codex-rs/tui/src/bottom_pane/mcp_server_elicitation.rs
View File

@@ -72,7 +72,9 @@ const TOOL_TYPE_KEY: &str = "tool_type";
const TOOL_ID_KEY: &str = "tool_id";
const TOOL_SUGGEST_SUGGEST_TYPE_KEY: &str = "suggest_type";
const TOOL_SUGGEST_REASON_KEY: &str = "suggest_reason";
const TOOL_SUGGEST_DESCRIPTION_KEY: &str = "description";
const TOOL_SUGGEST_INSTALL_URL_KEY: &str = "install_url";
const TOOL_SUGGEST_ENTRIES_KEY: &str = "entries";
#[derive(Clone, PartialEq, Default)]
struct ComposerDraft {
@@ -378,11 +380,6 @@ fn parse_tool_suggestion_request(meta: Option<&Value>) -> Option<ToolSuggestionR
return None;
}
let tool_type = match meta.get(TOOL_TYPE_KEY).and_then(Value::as_str) {
Some("connector") => ToolSuggestionToolType::Connector,
Some("plugin") => ToolSuggestionToolType::Plugin,
_ => return None,
};
let suggest_type = match meta
.get(TOOL_SUGGEST_SUGGEST_TYPE_KEY)
.and_then(Value::as_str)
@@ -391,17 +388,35 @@ fn parse_tool_suggestion_request(meta: Option<&Value>) -> Option<ToolSuggestionR
Some("enable") => ToolSuggestionType::Enable,
_ => return None,
};
let entry = meta
.get(TOOL_SUGGEST_ENTRIES_KEY)
.and_then(Value::as_array)
.and_then(|entries| match entries.as_slice() {
[entry] => entry.as_object(),
_ => None,
})
.unwrap_or(meta);
let tool_type = match entry.get(TOOL_TYPE_KEY).and_then(Value::as_str) {
Some("connector") => ToolSuggestionToolType::Connector,
Some("plugin") => ToolSuggestionToolType::Plugin,
_ => return None,
};
Some(ToolSuggestionRequest {
tool_type,
suggest_type,
suggest_reason: meta
.get(TOOL_SUGGEST_REASON_KEY)
.or_else(|| entry.get(TOOL_SUGGEST_DESCRIPTION_KEY))
.and_then(Value::as_str)
.unwrap_or_default()
.to_string(),
tool_id: entry.get(TOOL_ID_KEY).and_then(Value::as_str)?.to_string(),
tool_name: entry
.get(TOOL_NAME_KEY)
.and_then(Value::as_str)?
.to_string(),
tool_id: meta.get(TOOL_ID_KEY).and_then(Value::as_str)?.to_string(),
tool_name: meta.get(TOOL_NAME_KEY).and_then(Value::as_str)?.to_string(),
install_url: meta
install_url: entry
.get(TOOL_SUGGEST_INSTALL_URL_KEY)
.and_then(Value::as_str)
.map(ToString::to_string),
@@ -2067,6 +2082,44 @@ mod tests {
);
}
#[test]
fn one_entry_tool_suggestion_meta_is_parsed_into_request_payload() {
let request = from_form_request(
ThreadId::default(),
form_request(
"Choose integrations",
empty_object_schema(),
Some(serde_json::json!({
"codex_approval_kind": "tool_suggestion",
"suggest_type": "install",
"entries": [
{
"description": "Plan events and schedules.",
"id": "connector_2128aebfecb84f64a069897515042a44",
"tool_type": "connector",
"tool_id": "connector_2128aebfecb84f64a069897515042a44",
"tool_name": "Google Calendar",
"install_url": "https://example.test/google-calendar",
}
],
})),
),
)
.expect("expected tool suggestion form");
assert_eq!(
request.tool_suggestion(),
Some(&ToolSuggestionRequest {
tool_type: ToolSuggestionToolType::Connector,
suggest_type: ToolSuggestionType::Install,
suggest_reason: "Plan events and schedules.".to_string(),
tool_id: "connector_2128aebfecb84f64a069897515042a44".to_string(),
tool_name: "Google Calendar".to_string(),
install_url: Some("https://example.test/google-calendar".to_string()),
})
);
}
#[test]
fn plugin_tool_suggestion_meta_without_install_url_is_parsed_into_request_payload() {
let request = from_form_request(