mirror of
https://github.com/openai/codex.git
synced 2026-10-19 17:28:46 +00:00
Anthony Tafoya
a7e069dc3a
## What changed - Move catalog types and the `PluginProvider` listing interface into `codex-core-plugins`, with a concrete `PluginListQuery` carrying thread, turn, and MCP resource context. - Remove root resolution from `PluginProvider`; keep executor package access in `ExecutorPluginProvider::resolve_bound`, which retains the filesystem used to resolve the package. - Add shared provider result and error types, and re-export the listing API from `codex-mcp-extension`. ## Testing Update executor and manifest tests to use `resolve_bound`, and assert that malformed manifest errors preserve the underlying `serde_json::Error` as their source. GitOrigin-RevId: c6cd5a0269ed3b8ac9b93f306a70821e63e3671e
77 lines
2.6 KiB
Rust
77 lines
2.6 KiB
Rust
//! Source-neutral plugin discovery types.
|
|
|
|
use codex_utils_path_uri::PathUri;
|
|
use std::collections::BTreeMap;
|
|
|
|
/// One source's complete discovery snapshot; no entries means no plugins were found.
|
|
#[derive(Clone, Debug, Default, PartialEq, Eq)]
|
|
pub struct PluginCatalog {
|
|
pub entries: Vec<PluginCatalogEntry>,
|
|
pub warnings: Vec<String>,
|
|
}
|
|
|
|
/// Manifest metadata and every location that can supply the same logical plugin.
|
|
#[derive(Clone, PartialEq, Eq)]
|
|
pub struct PluginCatalogEntry {
|
|
pub id: PluginIdentity,
|
|
pub display_name: String,
|
|
pub version: Option<String>,
|
|
/// Serialized `.mcp.json` server declarations keyed by their authored names.
|
|
pub mcp_servers: BTreeMap<String, String>,
|
|
pub connector_ids: Vec<String>,
|
|
pub locations: Vec<PluginSourceLocation>,
|
|
}
|
|
|
|
impl std::fmt::Debug for PluginCatalogEntry {
|
|
fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
formatter
|
|
.debug_struct("PluginCatalogEntry")
|
|
.field("id", &self.id)
|
|
.field("display_name", &self.display_name)
|
|
.field("version", &self.version)
|
|
// Declaration values can contain secrets, so only log their keys.
|
|
.field(
|
|
"mcp_server_names",
|
|
&self.mcp_servers.keys().collect::<Vec<_>>(),
|
|
)
|
|
.field("connector_ids", &self.connector_ids)
|
|
.field("locations", &self.locations)
|
|
.finish()
|
|
}
|
|
}
|
|
|
|
/// Stable key used to merge discoveries of the same logical plugin.
|
|
/// Identity is independent of whether the plugin is supplied by the cloud or an executor.
|
|
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
|
|
pub enum PluginIdentity {
|
|
/// Stable ID assigned by plugin-service and shared by its materialized installations.
|
|
Remote { remote_plugin_id: String },
|
|
/// Local `name@marketplace` config key for a plugin without a remote ID.
|
|
Local { plugin_id: String },
|
|
}
|
|
|
|
impl PluginIdentity {
|
|
pub fn as_str(&self) -> &str {
|
|
match self {
|
|
Self::Remote { remote_plugin_id } => remote_plugin_id,
|
|
Self::Local { plugin_id } => plugin_id,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A source that can supply a plugin; cloud URIs are opaque, not local paths.
|
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
|
pub enum PluginSourceLocation {
|
|
Cloud {
|
|
resource_uri: String,
|
|
bundle_uri: Option<String>,
|
|
},
|
|
Executor {
|
|
/// Executor environment that owns `root`.
|
|
environment_id: String,
|
|
/// Local `name@marketplace` key used for this installation in configuration.
|
|
plugin_id: String,
|
|
root: PathUri,
|
|
},
|
|
}
|