mirror of
https://github.com/openai/codex.git
synced 2026-11-18 22:20:48 +00:00
Add configurable default plugin activation policy (#52220)
## What changed Support `plugins._default.enabled` with explicit per-plugin `enabled` overrides. Omission preserves existing source and account enablement; configuration cannot activate a plugin disabled at its source. Plugin settings such as remembered tool approvals inherit the default unless `enabled` is explicitly set. Apply the policy to plugin skills, MCP servers, Apps, and hooks, including selected executor roots and runtime configuration refreshes. Preserve the latest plugin policy when adding MCP dependencies and rebuild hooks when concurrent configuration updates replace their inputs. Report effective enablement in `plugin/list`, `plugin/installed`, `plugin/read`, and `plugin/share/list`. Remote installation still installs disabled packages, but skips MCP and Apps authentication setup without writing an enablement override. ## Testing Add regression coverage for default inheritance and explicit overrides, source-disabled plugins, policy refreshes during active turns, disabled or malformed selected plugin roots, and remote installation authentication behavior. GitOrigin-RevId: 83b70c5b47fc95474fec292f248683f1f887221e
This commit is contained in:
@@ -2167,27 +2167,31 @@ impl Session {
|
||||
state.session_configuration.provider.info().clone()
|
||||
}
|
||||
|
||||
pub(crate) async fn refresh_hooks(&self, config: Arc<Config>) {
|
||||
let disabled_plugin_ids = self.state.lock().await.active_disabled_plugin_ids.clone();
|
||||
let environments = self.services.turn_environments.snapshot().await;
|
||||
let hooks_config = build_hooks_config(
|
||||
config.as_ref(),
|
||||
self.services.plugins_manager.as_ref(),
|
||||
environments.single_local_environment(),
|
||||
&disabled_plugin_ids,
|
||||
)
|
||||
.await;
|
||||
pub(crate) async fn refresh_hooks(&self, mut config: Arc<Config>) {
|
||||
loop {
|
||||
let disabled_plugin_ids = self.state.lock().await.active_disabled_plugin_ids.clone();
|
||||
let environments = self.services.turn_environments.snapshot().await;
|
||||
let hooks_config = build_hooks_config(
|
||||
config.as_ref(),
|
||||
self.services.plugins_manager.as_ref(),
|
||||
environments.single_local_environment(),
|
||||
&disabled_plugin_ids,
|
||||
)
|
||||
.await;
|
||||
|
||||
let state = self.state.lock().await;
|
||||
// A newer refresh may have updated the config while this hook build was in flight.
|
||||
// Only publish hooks derived from the current config snapshot.
|
||||
if Arc::ptr_eq(
|
||||
&state.session_configuration.original_config_do_not_use,
|
||||
&config,
|
||||
) && state.active_disabled_plugin_ids == disabled_plugin_ids
|
||||
{
|
||||
let hooks = self.hooks().reconfigured(hooks_config);
|
||||
self.services.hooks.store(Arc::new(hooks));
|
||||
let state = self.state.lock().await;
|
||||
if Arc::ptr_eq(
|
||||
&state.session_configuration.original_config_do_not_use,
|
||||
&config,
|
||||
) && state.active_disabled_plugin_ids == disabled_plugin_ids
|
||||
{
|
||||
let hooks = self.hooks().reconfigured(hooks_config);
|
||||
self.services.hooks.store(Arc::new(hooks));
|
||||
return;
|
||||
}
|
||||
// Unrelated updates can replace the owner too. Rebuild current inputs
|
||||
// so they cannot strand a pending plugin-policy refresh.
|
||||
config = Arc::clone(&state.session_configuration.original_config_do_not_use);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3875,6 +3879,7 @@ impl Session {
|
||||
);
|
||||
// A step keeps the plugins from the environments it captured, even if shared MCP
|
||||
// moves on to another environment. Its skill tools and the model use this same copy.
|
||||
// Policy follows this step's MCP binding, which may have refreshed mid-turn.
|
||||
let selected_plugins = self
|
||||
.services
|
||||
.mcp_manager
|
||||
@@ -3889,6 +3894,7 @@ impl Session {
|
||||
)
|
||||
.with_session_source(&turn_context.session_source)
|
||||
.with_selected_environments(&environments.all_selections()),
|
||||
&mcp.config().plugins,
|
||||
&turn_context.disabled_plugin_ids,
|
||||
)
|
||||
.await;
|
||||
|
||||
Reference in New Issue
Block a user