mirror of
https://github.com/openai/codex.git
synced 2026-11-17 22:10:37 +00:00
Route curated plugin catalogs by authentication mode (#38429)
## Why The model provider does not reliably identify which curated plugin catalog is available. ChatGPT authentication can be used with a custom provider, while an unauthenticated session should use the API-compatible catalog regardless of its provider. ## What changed - Select the ChatGPT curated catalog only for authentication modes that use the Codex backend; use the API curated catalog for API-key and unauthenticated sessions. - Initialize standalone plugin managers with the current authentication mode across CLI, app-server, MCP, and external-agent migration paths. - Preserve authentication mode while detecting and importing migrated plugins. ## Testing - Cover catalog and skill routing across ChatGPT, API-key, unauthenticated, Bedrock, and custom-provider configurations. - Verify authenticated plugin migration uses the ChatGPT curated marketplace. GitOrigin-RevId: 660a339ee8891c33aad961078d3a979242a6a166
This commit is contained in:
committed by
copyberry
parent
507ef0b371
commit
f898ebcafd
@@ -1,8 +1,96 @@
|
||||
use super::super::*;
|
||||
use crate::migration_source::MarketplaceImportSource;
|
||||
use crate::source_cla;
|
||||
use codex_protocol::auth::AuthMode;
|
||||
use pretty_assertions::assert_eq;
|
||||
|
||||
#[tokio::test]
|
||||
async fn authenticated_plugin_migration_uses_chatgpt_curated_marketplace() {
|
||||
let (_root, external_agent_home, codex_home) = fixture_paths();
|
||||
let curated_root = codex_home.join(".tmp/plugins");
|
||||
let plugin_root = curated_root.join("plugins/sample");
|
||||
fs::create_dir_all(&external_agent_home).expect("create external agent home");
|
||||
fs::create_dir_all(curated_root.join(".agents/plugins"))
|
||||
.expect("create curated marketplace directory");
|
||||
fs::create_dir_all(plugin_root.join(".codex-plugin")).expect("create curated plugin directory");
|
||||
fs::write(
|
||||
external_agent_home.join("settings.json"),
|
||||
r#"{"enabledPlugins":{"sample@openai-curated":true}}"#,
|
||||
)
|
||||
.expect("write external agent settings");
|
||||
fs::write(
|
||||
codex_home.join("config.toml"),
|
||||
"[features]\nplugins = true\n",
|
||||
)
|
||||
.expect("write Codex config");
|
||||
fs::write(
|
||||
codex_home.join(".tmp/plugins.sha"),
|
||||
"0123456789abcdef0123456789abcdef01234567\n",
|
||||
)
|
||||
.expect("write curated plugin version");
|
||||
fs::write(
|
||||
curated_root.join(".agents/plugins/marketplace.json"),
|
||||
r#"{
|
||||
"name": "openai-curated",
|
||||
"plugins": [{
|
||||
"name": "sample",
|
||||
"source": {"source": "local", "path": "./plugins/sample"}
|
||||
}]
|
||||
}"#,
|
||||
)
|
||||
.expect("write curated marketplace");
|
||||
fs::write(
|
||||
plugin_root.join(".codex-plugin/plugin.json"),
|
||||
r#"{"name":"sample","version":"0.1.0"}"#,
|
||||
)
|
||||
.expect("write curated plugin manifest");
|
||||
|
||||
let service = service_for_paths(external_agent_home.clone(), codex_home)
|
||||
.with_auth_mode(Some(AuthMode::Chatgpt));
|
||||
let items = service
|
||||
.detect(ExternalAgentConfigDetectOptions {
|
||||
include_home: true,
|
||||
include_memory: false,
|
||||
cwds: None,
|
||||
})
|
||||
.await
|
||||
.expect("detect authenticated curated plugin");
|
||||
let details = Some(MigrationDetails {
|
||||
plugins: vec![PluginsMigration {
|
||||
marketplace_name: "openai-curated".to_string(),
|
||||
plugin_names: vec!["sample".to_string()],
|
||||
}],
|
||||
..Default::default()
|
||||
});
|
||||
assert_eq!(
|
||||
items,
|
||||
vec![ExternalAgentConfigMigrationItem {
|
||||
item_type: ExternalAgentConfigMigrationItemType::Plugins,
|
||||
description: format!(
|
||||
"Migrate enabled plugins from {}",
|
||||
external_agent_home.join("settings.json").display()
|
||||
),
|
||||
cwd: None,
|
||||
details: details.clone(),
|
||||
}]
|
||||
);
|
||||
|
||||
let outcome = service
|
||||
.import_plugins(/*cwd*/ None, details)
|
||||
.await
|
||||
.expect("import authenticated curated plugin");
|
||||
assert_eq!(
|
||||
outcome,
|
||||
PluginImportOutcome {
|
||||
succeeded_marketplaces: vec!["openai-curated".to_string()],
|
||||
succeeded_plugin_ids: vec!["sample@openai-curated".to_string()],
|
||||
failed_marketplaces: Vec::new(),
|
||||
failed_plugin_ids: Vec::new(),
|
||||
raw_errors: Vec::new(),
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn detect_home_lists_enabled_plugins_from_settings() {
|
||||
let (_root, external_agent_home, codex_home) = fixture_paths();
|
||||
|
||||
Reference in New Issue
Block a user