mirror of
https://github.com/openai/codex.git
synced 2026-10-23 18:08:45 +00:00
## Summary
This fixes plugin manifest parsing for MCP servers declared as an object
directly in `plugin.json`.
Before this change, Codex modeled `mcpServers` as only a string path,
for example:
```json
{
"name": "counter-sample",
"version": "1.1.1",
"mcpServers": "./.mcp.json"
}
```
Some migrated plugins instead provide the server map directly in the
manifest:
```json
{
"name": "counter-sample",
"version": "1.1.1",
"description": "Plugin that declares MCP servers in the manifest",
"mcpServers": {
"counter": {
"type": "http",
"url": "https://sample.example/counter/mcp"
}
}
}
```
That object form previously failed during install/load with an error
like:
```text
failed to parse plugin manifest: invalid type: map, expected a string
```
## What changed
- Add a manifest representation for `mcpServers` as either
`Path(Resource)` or `Object(map)`.
- Parse `plugin.json` `mcpServers` as either a string path or an object.
- Route object-valued MCP server maps through the existing plugin MCP
config parser instead of adding a second parser.
- Apply existing per-plugin MCP server policy to object-valued MCP
servers the same way as file-backed MCP servers.
- Include object-valued MCP server names in plugin telemetry/capability
metadata.
- Support object-valued MCP config for executor plugins without
requiring a `.mcp.json` filesystem read.
- Update the bundled plugin-creator validator and `plugin-json-spec.md`
so generated-plugin validation accepts the same object-valued shape.
## Compatibility
Existing plugin manifests that use `"mcpServers": "./.mcp.json"`
continue to work. Plugins can now also use the object shape shown above.
## Tests
Added coverage for the new manifest attribute shape at the install,
normal load, telemetry, and executor-provider layers:
- `install_accepts_manifest_mcp_server_objects`
- `load_plugins_loads_manifest_mcp_server_objects`
- `plugin_telemetry_metadata_uses_manifest_mcp_server_objects`
- `reads_manifest_object_config_without_executor_file_system_access`
Also smoke-tested the plugin-creator validator against both supported
forms:
- `mcpServers` as a direct object in `plugin.json`
- `mcpServers` as `"./.mcp.json"` with a companion `.mcp.json`
## Validation
- `just test -p codex-plugin`
- `just test -p codex-core-plugins`
- `just test -p codex-mcp-extension`
- `just bazel-lock-update`
- `just bazel-lock-check`
- `just fmt`
- `git diff --check`
- Focused rename/object-form rerun: `just test -p codex-core-plugins
manager::tests::load_plugins_loads_manifest_mcp_server_objects
manager::tests::plugin_telemetry_metadata_uses_manifest_mcp_server_objects
store::tests::install_accepts_manifest_mcp_server_objects`
- Focused executor rerun: `just test -p codex-mcp-extension
executor_plugin::provider::tests::reads_manifest_object_config_without_executor_file_system_access`
- `python3
codex-rs/skills/src/assets/samples/plugin-creator/scripts/validate_plugin.py
/private/tmp/codex-validator-object`
- `python3
codex-rs/skills/src/assets/samples/plugin-creator/scripts/validate_plugin.py
/private/tmp/codex-validator-path`
184 lines
6.0 KiB
Rust
184 lines
6.0 KiB
Rust
use codex_config::HooksFile;
|
|
|
|
/// Parsed plugin metadata parameterized by its resource locator representation.
|
|
///
|
|
/// Host loading uses absolute paths, while resolved packages replace them with
|
|
/// authority-bound locators before exposing the manifest to consumers.
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub struct PluginManifest<Resource> {
|
|
pub name: String,
|
|
pub version: Option<String>,
|
|
pub description: Option<String>,
|
|
pub keywords: Vec<String>,
|
|
pub paths: PluginManifestPaths<Resource>,
|
|
pub interface: Option<PluginManifestInterface<Resource>>,
|
|
}
|
|
|
|
/// Component resources declared by a plugin manifest.
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub struct PluginManifestPaths<Resource> {
|
|
pub skills: Option<Resource>,
|
|
pub mcp_servers: Option<PluginManifestMcpServers<Resource>>,
|
|
pub apps: Option<Resource>,
|
|
pub hooks: Option<PluginManifestHooks<Resource>>,
|
|
}
|
|
|
|
/// MCP server declarations embedded in or referenced by a plugin manifest.
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub enum PluginManifestMcpServers<Resource> {
|
|
Path(Resource),
|
|
Object(String),
|
|
}
|
|
|
|
/// Hook declarations embedded in or referenced by a plugin manifest.
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub enum PluginManifestHooks<Resource> {
|
|
Paths(Vec<Resource>),
|
|
Inline(Vec<HooksFile>),
|
|
}
|
|
|
|
/// Optional model- and UI-facing plugin metadata.
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub struct PluginManifestInterface<Resource> {
|
|
pub display_name: Option<String>,
|
|
pub short_description: Option<String>,
|
|
pub long_description: Option<String>,
|
|
pub developer_name: Option<String>,
|
|
pub category: Option<String>,
|
|
pub capabilities: Vec<String>,
|
|
pub website_url: Option<String>,
|
|
pub privacy_policy_url: Option<String>,
|
|
pub terms_of_service_url: Option<String>,
|
|
pub default_prompt: Option<Vec<String>>,
|
|
pub brand_color: Option<String>,
|
|
pub composer_icon: Option<Resource>,
|
|
pub logo: Option<Resource>,
|
|
pub screenshots: Vec<Resource>,
|
|
}
|
|
|
|
impl<Resource> Default for PluginManifestInterface<Resource> {
|
|
fn default() -> Self {
|
|
Self {
|
|
display_name: None,
|
|
short_description: None,
|
|
long_description: None,
|
|
developer_name: None,
|
|
category: None,
|
|
capabilities: Vec::new(),
|
|
website_url: None,
|
|
privacy_policy_url: None,
|
|
terms_of_service_url: None,
|
|
default_prompt: None,
|
|
brand_color: None,
|
|
composer_icon: None,
|
|
logo: None,
|
|
screenshots: Vec::new(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<Resource> PluginManifest<Resource> {
|
|
/// Returns the model- and UI-facing package name, falling back to the manifest name.
|
|
pub fn display_name(&self) -> &str {
|
|
self.interface
|
|
.as_ref()
|
|
.and_then(|interface| interface.display_name.as_deref())
|
|
.map(str::trim)
|
|
.filter(|display_name| !display_name.is_empty())
|
|
.unwrap_or(&self.name)
|
|
}
|
|
|
|
pub(crate) fn try_map_resources<Mapped, Error>(
|
|
self,
|
|
mut map: impl FnMut(Resource) -> Result<Mapped, Error>,
|
|
) -> Result<PluginManifest<Mapped>, Error> {
|
|
let PluginManifest {
|
|
name,
|
|
version,
|
|
description,
|
|
keywords,
|
|
paths,
|
|
interface,
|
|
} = self;
|
|
let PluginManifestPaths {
|
|
skills,
|
|
mcp_servers,
|
|
apps,
|
|
hooks,
|
|
} = paths;
|
|
let hooks = match hooks {
|
|
Some(PluginManifestHooks::Paths(paths)) => Some(PluginManifestHooks::Paths(
|
|
paths
|
|
.into_iter()
|
|
.map(&mut map)
|
|
.collect::<Result<Vec<_>, _>>()?,
|
|
)),
|
|
Some(PluginManifestHooks::Inline(hooks)) => Some(PluginManifestHooks::Inline(hooks)),
|
|
None => None,
|
|
};
|
|
let mcp_servers = match mcp_servers {
|
|
Some(PluginManifestMcpServers::Path(path)) => {
|
|
Some(PluginManifestMcpServers::Path(map(path)?))
|
|
}
|
|
Some(PluginManifestMcpServers::Object(servers)) => {
|
|
Some(PluginManifestMcpServers::Object(servers))
|
|
}
|
|
None => None,
|
|
};
|
|
let interface = match interface {
|
|
Some(interface) => {
|
|
let PluginManifestInterface {
|
|
display_name,
|
|
short_description,
|
|
long_description,
|
|
developer_name,
|
|
category,
|
|
capabilities,
|
|
website_url,
|
|
privacy_policy_url,
|
|
terms_of_service_url,
|
|
default_prompt,
|
|
brand_color,
|
|
composer_icon,
|
|
logo,
|
|
screenshots,
|
|
} = interface;
|
|
Some(PluginManifestInterface {
|
|
display_name,
|
|
short_description,
|
|
long_description,
|
|
developer_name,
|
|
category,
|
|
capabilities,
|
|
website_url,
|
|
privacy_policy_url,
|
|
terms_of_service_url,
|
|
default_prompt,
|
|
brand_color,
|
|
composer_icon: composer_icon.map(&mut map).transpose()?,
|
|
logo: logo.map(&mut map).transpose()?,
|
|
screenshots: screenshots
|
|
.into_iter()
|
|
.map(&mut map)
|
|
.collect::<Result<Vec<_>, _>>()?,
|
|
})
|
|
}
|
|
None => None,
|
|
};
|
|
|
|
Ok(PluginManifest {
|
|
name,
|
|
version,
|
|
description,
|
|
keywords,
|
|
paths: PluginManifestPaths {
|
|
skills: skills.map(&mut map).transpose()?,
|
|
mcp_servers,
|
|
apps: apps.map(&mut map).transpose()?,
|
|
hooks,
|
|
},
|
|
interface,
|
|
})
|
|
}
|
|
}
|