mirror of
https://github.com/openai/codex.git
synced 2026-10-20 17:38:45 +00:00
Anthony Tafoya
f7a135ec61
## What changed - Use V2 discovery inventories for plugin MCP contributions when supplied, including empty or failed inventories; retain legacy discovery when no V2 snapshot is supplied. - Merge plugins by canonical identity, using cloud metadata and enablement for remote plugins and attaching executor installations only when versions match. Preserve configured executor-local plugins and executor enablement when cloud data is unavailable. - Keep installation order stable across refreshes and run merged MCP declarations on the first retained executor installation while preserving attribution for the others. - Carry local and remote identities through selected-plugin snapshots, skill attribution, and active-plugin telemetry. Track disabled plugin IDs alongside disabled roots. - Preserve a complete cloud catalog when a partial refresh arrives, and cap tool-description plugin attribution at 1,024 bytes while retaining all plugin associations. ## Testing Add coverage for catalog parsing and reconciliation, enablement and discovery-mode selection, installation refresh ordering, executor-specific MCP normalization, selected-plugin snapshots, and bounded UTF-8 attribution text. GitOrigin-RevId: a8ad352de6a2b8dc4bfd1ff6a5c62ee8ed1d1664
134 lines
5.3 KiB
Rust
134 lines
5.3 KiB
Rust
mod app_mcp_routing;
|
|
mod artifact_operation;
|
|
mod catalog;
|
|
mod command_migration;
|
|
mod discoverable;
|
|
mod error_subtype;
|
|
mod executor_catalog;
|
|
mod executor_hooks;
|
|
mod executor_provider;
|
|
mod git_policy;
|
|
mod http_client_selector;
|
|
pub mod installed_marketplaces;
|
|
mod loaded_cache_metrics;
|
|
pub mod loader;
|
|
mod manager;
|
|
pub mod manifest;
|
|
pub mod marketplace;
|
|
pub mod marketplace_add;
|
|
mod marketplace_policy;
|
|
pub mod marketplace_remove;
|
|
pub mod marketplace_upgrade;
|
|
mod npm_source;
|
|
mod plugin_bundle_archive;
|
|
mod plugin_measurement_references;
|
|
mod plugin_metrics;
|
|
mod plugin_metrics_sidecar;
|
|
mod provider;
|
|
mod recommended_plugin_install;
|
|
pub mod remote;
|
|
pub mod remote_bundle;
|
|
pub mod remote_legacy;
|
|
mod remote_metadata;
|
|
mod remote_plugin_id_resolver;
|
|
mod script_attribution;
|
|
mod skill_snapshots;
|
|
pub mod startup_sync;
|
|
pub mod store;
|
|
#[cfg(test)]
|
|
mod test_support;
|
|
pub mod toggles;
|
|
mod tool_suggest_metadata;
|
|
|
|
pub(crate) use git_policy::PluginGitMode;
|
|
pub(crate) use git_policy::configure_trusted_git_repository;
|
|
|
|
pub const OPENAI_CURATED_MARKETPLACE_NAME: &str = "openai-curated";
|
|
pub const OPENAI_API_CURATED_MARKETPLACE_NAME: &str = "openai-api-curated";
|
|
pub const OPENAI_BUNDLED_MARKETPLACE_NAME: &str = "openai-bundled";
|
|
pub(crate) const OPENAI_BUNDLED_ALPHA_MARKETPLACE_NAME: &str = "openai-bundled-alpha";
|
|
pub(crate) const OPENAI_PRIMARY_RUNTIME_MARKETPLACE_NAME: &str = "openai-primary-runtime";
|
|
|
|
pub fn is_openai_curated_marketplace_name(marketplace_name: &str) -> bool {
|
|
marketplace_name == OPENAI_CURATED_MARKETPLACE_NAME
|
|
|| marketplace_name == OPENAI_API_CURATED_MARKETPLACE_NAME
|
|
}
|
|
|
|
pub type LoadedPlugin = codex_plugin::LoadedPlugin<codex_config::McpServerConfig>;
|
|
pub type PluginLoadOutcome = codex_plugin::PluginLoadOutcome<codex_config::McpServerConfig>;
|
|
|
|
pub use app_mcp_routing::apps_route_available;
|
|
pub use artifact_operation::ArtifactOperation;
|
|
pub use artifact_operation::recognize_artifact_operation;
|
|
pub use catalog::PluginCatalog;
|
|
pub use catalog::PluginCatalogEntry;
|
|
pub use catalog::PluginSourceLocation;
|
|
pub use catalog::merge_catalogs;
|
|
pub use codex_core_plugin_common::PluginIdentity;
|
|
pub use command_migration::CommandDescriptionMode;
|
|
pub use command_migration::CommandMigrationProfile;
|
|
pub use command_migration::RewriteProfile as CommandRewriteProfile;
|
|
pub use command_migration::count_missing_commands_with_profile;
|
|
pub use command_migration::import_commands_with_profile;
|
|
pub use command_migration::missing_command_names_with_profile;
|
|
pub use discoverable::ToolSuggestDiscoverablePlugin;
|
|
pub use discoverable::ToolSuggestPluginDiscoveryInput;
|
|
pub use executor_catalog::catalog_from_snapshots;
|
|
pub use executor_hooks::executor_plugin_hook_sources;
|
|
pub use executor_provider::ExecutorPluginProvider;
|
|
pub use executor_provider::ExecutorPluginProviderError;
|
|
pub use executor_provider::PluginRootOwnership;
|
|
pub use executor_provider::ResolvedExecutorPlugin;
|
|
pub use loader::PluginHookLoadOutcome;
|
|
pub use manager::ConfiguredMarketplace;
|
|
pub use manager::ConfiguredMarketplaceListOutcome;
|
|
pub use manager::ConfiguredMarketplacePlugin;
|
|
pub use manager::EffectivePluginsChange;
|
|
pub use manager::PluginDetail;
|
|
pub use manager::PluginDetailsUnavailableReason;
|
|
pub use manager::PluginInstallError;
|
|
pub use manager::PluginInstallOutcome;
|
|
pub use manager::PluginInstallRequest;
|
|
pub use manager::PluginListBackgroundTaskOptions;
|
|
pub use manager::PluginMarketplaceContext;
|
|
pub use manager::PluginMarketplaceScope;
|
|
pub use manager::PluginReadOutcome;
|
|
pub use manager::PluginReadRequest;
|
|
pub use manager::PluginUninstallError;
|
|
pub use manager::PluginsConfigInput;
|
|
pub use manager::PluginsManager;
|
|
pub use manager::RecommendedPluginCandidatesInput;
|
|
pub use manager::RemotePluginInstallOutcome;
|
|
pub use manager::RemotePluginInstallRequest;
|
|
pub use manager::RemotePluginOperationError;
|
|
pub use manager::RemotePluginOperationErrorKind;
|
|
pub use manager::RemotePluginUninstallOutcome;
|
|
pub use marketplace_policy::allowed_configured_marketplace_names;
|
|
pub use marketplace_upgrade::ConfigLayerReload;
|
|
pub use marketplace_upgrade::ConfiguredMarketplaceUpgradeError as PluginMarketplaceUpgradeError;
|
|
pub use marketplace_upgrade::ConfiguredMarketplaceUpgradeOutcome as PluginMarketplaceUpgradeOutcome;
|
|
pub use plugin_measurement_references::PluginMeasurementReference;
|
|
pub use plugin_measurement_references::RemotePluginMeasurementCache;
|
|
pub use plugin_metrics::PluginMeasurementDefinition;
|
|
pub use plugin_metrics::PluginMetricsOperation;
|
|
pub use plugin_metrics::ResolvedPluginMetricsOperation;
|
|
pub use plugin_metrics_sidecar::PLUGIN_METRICS_OUTPUT_ENV_VAR;
|
|
pub use plugin_metrics_sidecar::PluginMeasurementBatch;
|
|
pub use plugin_metrics_sidecar::PluginMetricsSidecar;
|
|
pub use plugin_metrics_sidecar::strip_output_env;
|
|
pub use provider::PluginListQuery;
|
|
pub use provider::PluginProvider;
|
|
pub use provider::PluginProviderError;
|
|
pub use provider::PluginProviderFuture;
|
|
pub use provider::PluginProviderResult;
|
|
pub use recommended_plugin_install::hydrate_selected_recommended_plugin_install_metadata;
|
|
pub use remote::RecommendedPlugin;
|
|
pub use remote::RecommendedPluginsMode;
|
|
pub use remote_metadata::remote_catalog_metadata_eq;
|
|
pub use script_attribution::PluginCommandAttribution;
|
|
pub use script_attribution::PluginMeasurementTarget;
|
|
pub use script_attribution::TrustedPluginRoots;
|
|
pub use script_attribution::command_script_arguments;
|
|
|
|
pub use marketplace_policy::configured_plugins_from_stack;
|