Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Restrict plugin install requests to the root thread (#45806)

Rennie7f83d4922d7e
diff --git a/codex-rs/core/src/tools/handlers/request_plugin_install.rs b/codex-rs/core/src/tools/handlers/request_plugin_install.rs
index 15bf9d90bb..cb08cc5e13 100644
--- a/codex-rs/core/src/tools/handlers/request_plugin_install.rs
+++ b/codex-rs/core/src/tools/handlers/request_plugin_install.rs
@@ -114,6 +114,12 @@ impl RequestPluginInstallHandler {
}
};
+ if turn.session_source.is_non_root_agent() {
+ return Err(FunctionCallError::RespondToModel(
+ "request_plugin_install can only be used by the root thread".to_string(),
+ ));
+ }
+
let (requested_tool_id, requested_tool_type, suggest_reason) = match self.presentation {
ToolSuggestPresentation::ListTool => {
let args: RequestPluginInstallArgs = parse_arguments(&arguments)?;
diff --git a/codex-rs/core/src/tools/handlers/request_plugin_install_tests.rs b/codex-rs/core/src/tools/handlers/request_plugin_install_tests.rs
index 631d0755bf..9d1b310934 100644
--- a/codex-rs/core/src/tools/handlers/request_plugin_install_tests.rs
+++ b/codex-rs/core/src/tools/handlers/request_plugin_install_tests.rs
@@ -4,6 +4,9 @@ use crate::plugins::test_support::load_plugins_config;
use crate::plugins::test_support::write_curated_plugin_sha;
use crate::plugins::test_support::write_openai_api_curated_marketplace;
use crate::plugins::test_support::write_plugins_feature_config;
+use crate::session::step_context::StepContext;
+use crate::session::tests::make_session_and_context;
+use crate::turn_diff_tracker::TurnDiffTracker;
use codex_config::CONFIG_TOML_FILE;
use codex_config::config_toml::ConfigToml;
use codex_config::types::ToolSuggestConfig;
@@ -13,6 +16,9 @@ use codex_config::types::ToolSuggestDiscoverableType;
use codex_core_plugins::PluginInstallRequest;
use codex_core_plugins::startup_sync::curated_plugins_repo_path;
use codex_login::test_support::auth_manager_from_optional_auth;
+use codex_protocol::ThreadId;
+use codex_protocol::protocol::SessionSource;
+use codex_protocol::protocol::SubAgentSource;
use codex_rmcp_client::ElicitationResponse;
use codex_tools::DiscoverablePluginInfo;
use codex_utils_absolute_path::AbsolutePathBuf;
@@ -21,6 +27,61 @@ use pretty_assertions::assert_eq;
use rmcp::model::ElicitationAction;
use serde_json::json;
use tempfile::tempdir;
+use test_case::test_case;
+use tokio::sync::Mutex;
+
+#[test_case(ToolSuggestPresentation::ListTool; "legacy install")]
+#[test_case(ToolSuggestPresentation::RecommendationContext; "recommended plugin")]
+#[tokio::test]
+async fn request_plugin_install_rejects_subagent_threads(presentation: ToolSuggestPresentation) {
+ let (session, mut turn) = make_session_and_context().await;
+ turn.session_source = SessionSource::SubAgent(SubAgentSource::ThreadSpawn {
+ parent_thread_id: ThreadId::new(),
+ depth: 1,
+ agent_path: None,
+ agent_nickname: None,
+ agent_role: None,
+ });
+ let turn = Arc::new(turn);
+ let arguments = match presentation {
+ ToolSuggestPresentation::ListTool => json!({
+ "tool_type": "connector",
+ "action_type": "install",
+ "tool_id": "connector_calendar",
+ "suggest_reason": "Read the calendar for this request"
+ }),
+ ToolSuggestPresentation::RecommendationContext => json!({
+ "plugin_id": "google-calendar@openai-curated-remote",
+ "suggest_reason": "Read the calendar for this request"
+ }),
+ };
+
+ let result = RequestPluginInstallHandler::new(Vec::new(), presentation)
+ .handle(ToolInvocation {
+ session: Arc::new(session),
+ step_context: StepContext::for_test(Arc::clone(&turn)),
+ turn,
+ cancellation_token: tokio_util::sync::CancellationToken::new(),
+ tracker: Arc::new(Mutex::new(TurnDiffTracker::default())),
+ call_id: "call-1".to_string(),
+ tool_name: codex_tools::ToolName::plain(REQUEST_PLUGIN_INSTALL_TOOL_NAME),
+ source: crate::tools::context::ToolCallSource::Direct,
+ payload: ToolPayload::Function {
+ arguments: arguments.to_string(),
+ },
+ })
+ .await;
+
+ let Err(err) = result else {
+ panic!("subagent request_plugin_install should fail");
+ };
+ assert_eq!(
+ err,
+ FunctionCallError::RespondToModel(
+ "request_plugin_install can only be used by the root thread".to_string(),
+ )
+ );
+}
#[test]
fn request_plugin_install_does_not_support_parallel_tool_calls() {
diff --git a/codex-rs/core/tests/suite/request_plugin_install.rs b/codex-rs/core/tests/suite/request_plugin_install.rs
index 949b3c799a..e7876381e7 100644
--- a/codex-rs/core/tests/suite/request_plugin_install.rs
+++ b/codex-rs/core/tests/suite/request_plugin_install.rs
@@ -5,6 +5,8 @@ use anyhow::Result;
use codex_config::types::ToolSuggestDisabledTool;
use codex_config::types::ToolSuggestDiscoverable;
use codex_config::types::ToolSuggestDiscoverableType;
+use codex_core::NewThread;
+use codex_core::StartThreadOptions;
use codex_core::TurnInputRequest;
use codex_core::config::Config;
use codex_core_plugins::startup_sync::curated_plugins_repo_path;
@@ -26,6 +28,8 @@ use codex_protocol::models::PermissionProfile;
use codex_protocol::protocol::AskForApproval;
use codex_protocol::protocol::EventMsg;
use codex_protocol::protocol::Op;
+use codex_protocol::protocol::SessionSource;
+use codex_protocol::protocol::SubAgentSource;
use codex_protocol::protocol::ThreadSettingsOverrides;
use codex_protocol::user_input::UserInput;
use codex_utils_path_uri::PathUri;
@@ -746,6 +750,117 @@ async fn unavailable_recommendations_preserve_legacy_workflow(
Ok(())
}
+#[test_case(false; "legacy connector")]
+#[test_case(true; "recommended plugin")]
+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+async fn subagent_install_request_returns_root_only_error(
+ recommended_plugins_enabled: bool,
+) -> Result<()> {
+ skip_if_no_network!(Ok(()));
+
+ let server = start_mock_server().await;
+ let apps_server = AppsTestServer::mount(&server).await?;
+ let (recommendations, arguments) = if recommended_plugins_enabled {
+ (
+ json!({
+ "enabled": true,
+ "plugins": [{
+ "id": REMOTE_CALENDAR_PLUGIN_ID,
+ "name": "calendar",
+ "display_name": "Calendar"
+ }]
+ }),
+ json!({
+ "plugin_id": REMOTE_CALENDAR_PLUGIN_CONFIG_ID,
+ "suggest_reason": "Use Calendar for this task"
+ }),
+ )
+ } else {
+ (
+ json!({"enabled": false, "plugins": []}),
+ json!({
+ "tool_type": "connector",
+ "action_type": "install",
+ "tool_id": DISCOVERABLE_GMAIL_ID,
+ "suggest_reason": "Use Gmail for this task"
+ }),
+ )
+ };
+ mount_recommendations(
+ &server,
+ ResponseTemplate::new(200).set_body_json(recommendations),
+ )
+ .await;
+ let call_id = "subagent-plugin-install";
+ let mock = mount_sse_sequence(
+ &server,
+ vec![
+ sse(vec![
+ ev_response_created("resp-1"),
+ ev_function_call(
+ call_id,
+ REQUEST_PLUGIN_INSTALL_TOOL_NAME,
+ &arguments.to_string(),
+ ),
+ ev_completed("resp-1"),
+ ]),
+ sse(vec![
+ ev_response_created("resp-2"),
+ ev_assistant_message("msg-1", "done"),
+ ev_completed("resp-2"),
+ ]),
+ ],
+ )
+ .await;
+ let test = build_test(&server, &apps_server).await?;
+ let NewThread {
+ thread: subagent, ..
+ } = test
+ .thread_manager
+ .start_thread(StartThreadOptions {
+ session_source: Some(SessionSource::SubAgent(SubAgentSource::ThreadSpawn {
+ parent_thread_id: test.session_configured.thread_id,
+ depth: 1,
+ agent_path: None,
+ agent_nickname: None,
+ agent_role: None,
+ })),
+ ..StartThreadOptions::new(test.config.clone())
+ })
+ .await?;
+ subagent
+ .start_or_steer_turn(
+ TurnInputRequest::user_input(vec![UserInput::Text {
+ text: "Use the requested integration.".to_string(),
+ text_elements: Vec::new(),
+ }])
+ .with_thread_settings(ThreadSettingsOverrides {
+ approval_policy: Some(AskForApproval::Never),
+ permission_profile: Some(PermissionProfile::Disabled),
+ ..Default::default()
+ }),
+ )
+ .await?;
+ wait_for_event(&subagent, |event| {
+ assert!(
+ !matches!(event, EventMsg::ElicitationRequest(_)),
+ "subagents must not request plugin installation"
+ );
+ matches!(event, EventMsg::TurnComplete(_))
+ })
+ .await;
+
+ let requests = mock.requests();
+ assert_eq!(requests.len(), 2);
+ assert_eq!(
+ requests[1].function_call_output_text(call_id).as_deref(),
+ Some("request_plugin_install can only be used by the root thread")
+ );
+ subagent.shutdown_and_wait().await?;
+ test.codex.shutdown_and_wait().await?;
+ Ok(())
+}
+
#[test_case(true; "enabled plugin skill")]
#[test_case(false; "disabled plugin skill")]
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]