Improve external agent plugin migration for configured marketplaces (#18055)

codex-rs/core/src/plugins/manager.rs

@@ -1346,7 +1346,7 @@ impl PluginUninstallError {
     }
 }
 
-fn configured_plugins_from_stack(
+pub(crate) fn configured_plugins_from_stack(
     config_layer_stack: &ConfigLayerStack,
 ) -> HashMap<String, PluginConfig> {
     // Plugin entries remain persisted user config only.

codex-rs/core/src/plugins/marketplace_add.rs

@@ -20,7 +20,7 @@ use metadata::find_marketplace_root_by_name;
 use metadata::installed_marketplace_root_for_source;
 use metadata::record_added_marketplace_entry;
 use source::MarketplaceSource;
-use source::parse_marketplace_source;
+pub(crate) use source::parse_marketplace_source;
 use source::stage_marketplace_source;
 use source::validate_marketplace_source_root;
 

codex-rs/core/src/plugins/marketplace_add/source.rs

@@ -5,7 +5,7 @@ use std::path::Path;
 use std::path::PathBuf;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub(super) enum MarketplaceSource {
+pub(crate) enum MarketplaceSource {
     Git {
         url: String,
         ref_name: Option<String>,
@@ -15,7 +15,7 @@ pub(super) enum MarketplaceSource {
     },
 }
 
-pub(super) fn parse_marketplace_source(
+pub(crate) fn parse_marketplace_source(
     source: &str,
     explicit_ref: Option<String>,
 ) -> Result<MarketplaceSource, MarketplaceAddError> {

codex-rs/core/src/plugins/mod.rs

@@ -22,6 +22,7 @@ pub use codex_plugin::validate_plugin_segment;
 pub type LoadedPlugin = codex_plugin::LoadedPlugin<McpServerConfig>;
 pub type PluginLoadOutcome = codex_plugin::PluginLoadOutcome<McpServerConfig>;
 
+pub(crate) use codex_core_plugins::marketplace::find_marketplace_manifest_path;
 pub(crate) use discoverable::list_tool_suggest_discoverable_plugins;
 pub(crate) use injection::build_plugin_injections;
 pub use installed_marketplaces::INSTALLED_MARKETPLACES_DIR;
@@ -40,10 +41,12 @@ pub use manager::PluginRemoteSyncError;
 pub use manager::PluginUninstallError;
 pub use manager::PluginsManager;
 pub use manager::RemotePluginSyncResult;
+pub(crate) use manager::configured_plugins_from_stack;
 pub use marketplace_add::MarketplaceAddError;
 pub use marketplace_add::MarketplaceAddOutcome;
 pub use marketplace_add::MarketplaceAddRequest;
 pub use marketplace_add::add_marketplace;
+pub(crate) use marketplace_add::parse_marketplace_source;
 pub(crate) use render::render_explicit_plugin_instructions;
 pub(crate) use render::render_plugins_section;
 pub(crate) use startup_sync::curated_plugins_repo_path;