Move plugin out of core. (#20348)

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

@@ -3,11 +3,11 @@ use std::collections::HashSet;
 use tracing::warn;
 
 use super::PluginCapabilitySummary;
-use super::PluginsManager;
 use crate::config::Config;
 use codex_config::types::ToolSuggestDiscoverableType;
 use codex_core_plugins::OPENAI_BUNDLED_MARKETPLACE_NAME;
 use codex_core_plugins::OPENAI_CURATED_MARKETPLACE_NAME;
+use codex_core_plugins::PluginsManager;
 use codex_core_plugins::TOOL_SUGGEST_DISCOVERABLE_PLUGIN_ALLOWLIST;
 use codex_features::Feature;
 use codex_tools::DiscoverablePluginInfo;
@@ -25,6 +25,7 @@ pub(crate) async fn list_tool_suggest_discoverable_plugins(
     }
 
     let plugins_manager = PluginsManager::new(config.codex_home.to_path_buf());
+    let plugins_input = config.plugins_config_input();
     let configured_plugin_ids = config
         .tool_suggest
         .discoverables
@@ -40,7 +41,7 @@ pub(crate) async fn list_tool_suggest_discoverable_plugins(
         .map(|disabled_tool| disabled_tool.id.as_str())
         .collect::<HashSet<_>>();
     let marketplaces = plugins_manager
-        .list_marketplaces_for_config(config, &[])
+        .list_marketplaces_for_config(&plugins_input, &[])
         .context("failed to list plugin marketplaces for tool suggestions")?
         .marketplaces;
     let mut discoverable_plugins = Vec::<DiscoverablePluginInfo>::new();
@@ -62,7 +63,11 @@ pub(crate) async fn list_tool_suggest_discoverable_plugins(
             let plugin_id = plugin.id.clone();
 
             match plugins_manager
-                .read_plugin_detail_for_marketplace_plugin(config, &marketplace_name, plugin)
+                .read_plugin_detail_for_marketplace_plugin(
+                    &plugins_input,
+                    &marketplace_name,
+                    plugin,
+                )
                 .await
             {
                 Ok(plugin) => {

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

@@ -1,11 +1,11 @@
 use super::*;
-use crate::plugins::PluginInstallRequest;
 use crate::plugins::test_support::load_plugins_config;
 use crate::plugins::test_support::write_curated_plugin;
 use crate::plugins::test_support::write_curated_plugin_sha;
 use crate::plugins::test_support::write_file;
 use crate::plugins::test_support::write_openai_curated_marketplace;
 use crate::plugins::test_support::write_plugins_feature_config;
+use codex_core_plugins::PluginInstallRequest;
 use codex_core_plugins::startup_sync::curated_plugins_repo_path;
 use codex_tools::DiscoverablePluginInfo;
 use codex_utils_absolute_path::AbsolutePathBuf;

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

@@ -1,43 +1,14 @@
-use codex_config::types::McpServerConfig;
-
 mod discoverable;
 mod injection;
-mod manager;
 mod mentions;
 mod render;
-mod startup_sync;
 #[cfg(test)]
 pub(crate) mod test_support;
 
-pub use codex_core_plugins::marketplace_upgrade::ConfiguredMarketplaceUpgradeError as PluginMarketplaceUpgradeError;
-pub use codex_core_plugins::marketplace_upgrade::ConfiguredMarketplaceUpgradeOutcome as PluginMarketplaceUpgradeOutcome;
-pub use codex_plugin::AppConnectorId;
-pub use codex_plugin::EffectiveSkillRoots;
-pub use codex_plugin::PluginCapabilitySummary;
-pub use codex_plugin::PluginId;
-pub use codex_plugin::PluginIdError;
-pub use codex_plugin::PluginTelemetryMetadata;
-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_plugin::PluginCapabilitySummary;
 
 pub(crate) use discoverable::list_tool_suggest_discoverable_plugins;
 pub(crate) use injection::build_plugin_injections;
-pub use manager::ConfiguredMarketplace;
-pub use manager::ConfiguredMarketplaceListOutcome;
-pub use manager::ConfiguredMarketplacePlugin;
-pub use manager::PluginDetail;
-pub use manager::PluginDetailsUnavailableReason;
-pub use manager::PluginInstallError;
-pub use manager::PluginInstallOutcome;
-pub use manager::PluginInstallRequest;
-pub use manager::PluginReadOutcome;
-pub use manager::PluginReadRequest;
-pub use manager::PluginRemoteSyncError;
-pub use manager::PluginUninstallError;
-pub use manager::PluginsManager;
-pub use manager::RemotePluginSyncResult;
 pub(crate) use render::render_explicit_plugin_instructions;
 
 pub(crate) use mentions::build_connector_slug_counts;

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

@@ -1,100 +0,0 @@
-use std::path::Path;
-use std::path::PathBuf;
-use std::sync::Arc;
-use std::time::Duration;
-
-use crate::config::Config;
-use crate::plugins::PluginsManager;
-use codex_core_plugins::startup_sync::has_local_curated_plugins_snapshot;
-use codex_login::AuthManager;
-use tracing::info;
-use tracing::warn;
-
-const STARTUP_REMOTE_PLUGIN_SYNC_MARKER_FILE: &str = ".tmp/app-server-remote-plugin-sync-v1";
-const STARTUP_REMOTE_PLUGIN_SYNC_PREREQUISITE_TIMEOUT: Duration = Duration::from_secs(10);
-
-pub(crate) fn start_startup_remote_plugin_sync_once(
-    manager: Arc<PluginsManager>,
-    codex_home: PathBuf,
-    config: Config,
-    auth_manager: Arc<AuthManager>,
-) {
-    let marker_path = startup_remote_plugin_sync_marker_path(codex_home.as_path());
-    if marker_path.is_file() {
-        return;
-    }
-
-    tokio::spawn(async move {
-        if marker_path.is_file() {
-            return;
-        }
-
-        if !wait_for_startup_remote_plugin_sync_prerequisites(codex_home.as_path()).await {
-            warn!(
-                codex_home = %codex_home.display(),
-                "skipping startup remote plugin sync because curated marketplace is not ready"
-            );
-            return;
-        }
-
-        let auth = auth_manager.auth().await;
-        match manager
-            .sync_plugins_from_remote(&config, auth.as_ref(), /*additive_only*/ true)
-            .await
-        {
-            Ok(sync_result) => {
-                info!(
-                    installed_plugin_ids = ?sync_result.installed_plugin_ids,
-                    enabled_plugin_ids = ?sync_result.enabled_plugin_ids,
-                    disabled_plugin_ids = ?sync_result.disabled_plugin_ids,
-                    uninstalled_plugin_ids = ?sync_result.uninstalled_plugin_ids,
-                    "completed startup remote plugin sync"
-                );
-                if let Err(err) =
-                    write_startup_remote_plugin_sync_marker(codex_home.as_path()).await
-                {
-                    warn!(
-                        error = %err,
-                        path = %marker_path.display(),
-                        "failed to persist startup remote plugin sync marker"
-                    );
-                }
-            }
-            Err(err) => {
-                warn!(
-                    error = %err,
-                    "startup remote plugin sync failed; will retry on next app-server start"
-                );
-            }
-        }
-    });
-}
-
-fn startup_remote_plugin_sync_marker_path(codex_home: &Path) -> PathBuf {
-    codex_home.join(STARTUP_REMOTE_PLUGIN_SYNC_MARKER_FILE)
-}
-
-async fn wait_for_startup_remote_plugin_sync_prerequisites(codex_home: &Path) -> bool {
-    let deadline = tokio::time::Instant::now() + STARTUP_REMOTE_PLUGIN_SYNC_PREREQUISITE_TIMEOUT;
-    loop {
-        if has_local_curated_plugins_snapshot(codex_home) {
-            return true;
-        }
-        if tokio::time::Instant::now() >= deadline {
-            return false;
-        }
-        tokio::time::sleep(Duration::from_millis(50)).await;
-    }
-}
-
-async fn write_startup_remote_plugin_sync_marker(codex_home: &Path) -> std::io::Result<()> {
-    let marker_path = startup_remote_plugin_sync_marker_path(codex_home);
-    if let Some(parent) = marker_path.parent() {
-        tokio::fs::create_dir_all(parent).await?;
-    }
-    tokio::fs::write(marker_path, b"ok\n").await
-}
-
-#[cfg(test)]
-#[path = "startup_sync_tests.rs"]
-mod tests;

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

@@ -1,90 +0,0 @@
-use super::*;
-use crate::config::CONFIG_TOML_FILE;
-use crate::plugins::PluginsManager;
-use crate::plugins::test_support::TEST_CURATED_PLUGIN_CACHE_VERSION;
-use crate::plugins::test_support::write_curated_plugin_sha;
-use crate::plugins::test_support::write_file;
-use crate::plugins::test_support::write_openai_curated_marketplace;
-use codex_core_plugins::startup_sync::curated_plugins_repo_path;
-use codex_login::AuthManager;
-use codex_login::CodexAuth;
-use pretty_assertions::assert_eq;
-use std::sync::Arc;
-use std::time::Duration;
-use tempfile::tempdir;
-use wiremock::Mock;
-use wiremock::MockServer;
-use wiremock::ResponseTemplate;
-use wiremock::matchers::header;
-use wiremock::matchers::method;
-use wiremock::matchers::path;
-
-#[tokio::test]
-async fn startup_remote_plugin_sync_writes_marker_and_reconciles_state() {
-    let tmp = tempdir().expect("tempdir");
-    let curated_root = curated_plugins_repo_path(tmp.path());
-    write_openai_curated_marketplace(&curated_root, &["linear"]);
-    write_curated_plugin_sha(tmp.path());
-    write_file(
-        &tmp.path().join(CONFIG_TOML_FILE),
-        r#"[features]
-plugins = true
-
-[plugins."linear@openai-curated"]
-enabled = false
-"#,
-    );
-
-    let server = MockServer::start().await;
-    Mock::given(method("GET"))
-        .and(path("/backend-api/plugins/list"))
-        .and(header("authorization", "Bearer Access Token"))
-        .and(header("chatgpt-account-id", "account_id"))
-        .respond_with(ResponseTemplate::new(200).set_body_string(
-            r#"[
-  {"id":"1","name":"linear","marketplace_name":"openai-curated","version":"1.0.0","enabled":true}
-]"#,
-        ))
-        .mount(&server)
-        .await;
-
-    let mut config = crate::plugins::test_support::load_plugins_config(tmp.path()).await;
-    config.chatgpt_base_url = format!("{}/backend-api/", server.uri());
-    let manager = Arc::new(PluginsManager::new(tmp.path().to_path_buf()));
-    let auth_manager =
-        AuthManager::from_auth_for_testing(CodexAuth::create_dummy_chatgpt_auth_for_testing());
-
-    start_startup_remote_plugin_sync_once(
-        Arc::clone(&manager),
-        tmp.path().to_path_buf(),
-        config,
-        auth_manager,
-    );
-
-    let marker_path = tmp.path().join(STARTUP_REMOTE_PLUGIN_SYNC_MARKER_FILE);
-    tokio::time::timeout(Duration::from_secs(5), async {
-        loop {
-            if marker_path.is_file() {
-                break;
-            }
-            tokio::time::sleep(Duration::from_millis(10)).await;
-        }
-    })
-    .await
-    .expect("marker should be written");
-
-    assert!(
-        tmp.path()
-            .join(format!(
-                "plugins/cache/openai-curated/linear/{TEST_CURATED_PLUGIN_CACHE_VERSION}"
-            ))
-            .is_dir()
-    );
-    let config =
-        std::fs::read_to_string(tmp.path().join(CONFIG_TOML_FILE)).expect("config should exist");
-    assert!(config.contains(r#"[plugins."linear@openai-curated"]"#));
-    assert!(config.contains("enabled = true"));
-
-    let marker_contents = std::fs::read_to_string(marker_path).expect("marker should be readable");
-    assert_eq!(marker_contents, "ok\n");
-}

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

@@ -6,7 +6,6 @@ use std::path::Path;
 use codex_core_plugins::OPENAI_CURATED_MARKETPLACE_NAME;
 
 pub(crate) const TEST_CURATED_PLUGIN_SHA: &str = "0123456789abcdef0123456789abcdef01234567";
-pub(crate) const TEST_CURATED_PLUGIN_CACHE_VERSION: &str = "01234567";
 
 pub(crate) fn write_file(path: &Path, contents: &str) {
     fs::create_dir_all(path.parent().expect("file should have a parent")).unwrap();