mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
## Stack - Base: #27184 - This PR is the second vertical and should be reviewed against `jif/external-plugins-1`, not `main`. ## Why CCA is moving toward a split runtime where the orchestrator may have no filesystem or executor, but it still needs to activate remotely hosted plugin components. HTTP MCP servers are the simplest complete example: they need configuration and host authentication, but they do not need an executor process. The Apps MCP endpoint is currently synthesized by a special-purpose loader inside the MCP runtime. That works locally, but it leaves hosted MCP activation outside the extension model being established in #27184. It also makes the Apps path a poor foundation for plugins whose skills, MCP servers, connectors, and hooks may come from different sources or execute in different places. This PR moves that one behavior behind an extension-owned contribution while preserving the existing local fallback. It deliberately does not introduce a generic plugin activation framework. ## What changed ### MCP extension contribution `codex-extension-api` gains an ordered `McpServerContributor` contract. A contributor returns typed `Set` or `Remove` overlays for MCP server configuration; later contributors win for the names they own. The contract stays at the existing MCP configuration boundary. Extensions do not create a second connection manager or transport abstraction. ### Hosted Apps MCP extension A new `codex-mcp-extension` contributes the reserved `codex_apps` server from the existing Apps feature, ChatGPT base URL, path override, and product SKU configuration. When `apps_mcp_path_override` is enabled for `https://chatgpt.com`, the resulting streamable HTTP endpoint is `https://chatgpt.com/backend-api/ps/mcp`. The existing ChatGPT-auth gate remains authoritative, so this server can run in an orchestrator-only process without being exposed for API-key sessions. ### One resolved runtime view `McpManager` now distinguishes three views: - **configured:** config- and plugin-backed servers before extension overlays; - **runtime:** configured servers plus host-installed extension contributions; - **effective:** runtime servers after auth gating and compatibility built-ins. App-server installs the hosted MCP extension and uses the runtime view for thread startup, refresh, status, threadless resource reads, connector discovery, and MCP OAuth lookup. This keeps `mcpServer/oauth/login` consistent with the servers exposed by the other MCP APIs. The hosted Apps server itself continues to use existing ChatGPT host authentication rather than MCP OAuth. ## Compatibility Hosts that do not install the MCP extension retain the existing Apps MCP synthesis path. This preserves current local-only, CLI, and standalone-host behavior while app-server exercises the extension path. Disabling Apps removes the reserved `codex_apps` entry, and losing ChatGPT auth removes it from the effective runtime view. Executor availability is not consulted for this HTTP transport. ## Follow-ups The next vertical will resolve a manifest-declared stdio MCP server from an executor-selected plugin root and execute it in the environment that owns that root. Later verticals can add backend-owned skills, connector metadata, hooks, durable selection semantics, and incremental local convergence without changing the component-specific runtime boundaries introduced here. ## Verification Focused coverage was added for: - contributing the hosted Apps MCP at `/backend-api/ps/mcp` without an executor; - requiring ChatGPT auth in the effective runtime view; - removing a reserved configured Apps server when the Apps feature is disabled. `cargo check -p codex-app-server -p codex-mcp-extension -p codex-extension-api -p codex-mcp` passed. Tests and Clippy were not run locally under the current development instruction; CI provides the full validation pass.
248 lines
9.5 KiB
Rust
248 lines
9.5 KiB
Rust
use std::sync::Arc;
|
|
|
|
use codex_protocol::protocol::ReviewDecision;
|
|
|
|
use crate::ApprovalReviewContributor;
|
|
use crate::ConfigContributor;
|
|
use crate::ContextContributor;
|
|
use crate::ExtensionData;
|
|
use crate::ExtensionEventSink;
|
|
use crate::McpServerContributor;
|
|
use crate::NoopExtensionEventSink;
|
|
use crate::ThreadLifecycleContributor;
|
|
use crate::TokenUsageContributor;
|
|
use crate::ToolContributor;
|
|
use crate::ToolLifecycleContributor;
|
|
use crate::TurnInputContributor;
|
|
use crate::TurnItemContributor;
|
|
use crate::TurnLifecycleContributor;
|
|
|
|
/// Mutable registry used while hosts register typed runtime contributions.
|
|
pub struct ExtensionRegistryBuilder<C: Sync> {
|
|
event_sink: Arc<dyn ExtensionEventSink>,
|
|
thread_lifecycle_contributors: Vec<Arc<dyn ThreadLifecycleContributor<C>>>,
|
|
turn_lifecycle_contributors: Vec<Arc<dyn TurnLifecycleContributor>>,
|
|
config_contributors: Vec<Arc<dyn ConfigContributor<C>>>,
|
|
token_usage_contributors: Vec<Arc<dyn TokenUsageContributor>>,
|
|
context_contributors: Vec<Arc<dyn ContextContributor>>,
|
|
mcp_server_contributors: Vec<Arc<dyn McpServerContributor<C>>>,
|
|
turn_input_contributors: Vec<Arc<dyn TurnInputContributor>>,
|
|
tool_contributors: Vec<Arc<dyn ToolContributor>>,
|
|
tool_lifecycle_contributors: Vec<Arc<dyn ToolLifecycleContributor>>,
|
|
turn_item_contributors: Vec<Arc<dyn TurnItemContributor>>,
|
|
approval_review_contributors: Vec<Arc<dyn ApprovalReviewContributor>>,
|
|
}
|
|
|
|
impl<C: Sync> Default for ExtensionRegistryBuilder<C> {
|
|
fn default() -> Self {
|
|
Self {
|
|
event_sink: Arc::new(NoopExtensionEventSink),
|
|
thread_lifecycle_contributors: Vec::new(),
|
|
turn_lifecycle_contributors: Vec::new(),
|
|
config_contributors: Vec::new(),
|
|
token_usage_contributors: Vec::new(),
|
|
approval_review_contributors: Vec::new(),
|
|
context_contributors: Vec::new(),
|
|
mcp_server_contributors: Vec::new(),
|
|
turn_input_contributors: Vec::new(),
|
|
tool_contributors: Vec::new(),
|
|
tool_lifecycle_contributors: Vec::new(),
|
|
turn_item_contributors: Vec::new(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<C: Sync> ExtensionRegistryBuilder<C> {
|
|
/// Creates an empty registry builder.
|
|
pub fn new() -> Self {
|
|
Self::default()
|
|
}
|
|
|
|
/// Creates an empty registry builder with a host-provided event sink.
|
|
pub fn with_event_sink(event_sink: Arc<dyn ExtensionEventSink>) -> Self {
|
|
Self {
|
|
event_sink,
|
|
..Self::default()
|
|
}
|
|
}
|
|
|
|
/// Returns the host event sink to pass into extension constructors.
|
|
pub fn event_sink(&self) -> Arc<dyn ExtensionEventSink> {
|
|
Arc::clone(&self.event_sink)
|
|
}
|
|
|
|
/// Registers one approval-review contributor.
|
|
pub fn approval_review_contributor(&mut self, contributor: Arc<dyn ApprovalReviewContributor>) {
|
|
self.approval_review_contributors.push(contributor);
|
|
}
|
|
|
|
/// Registers one thread-lifecycle contributor.
|
|
pub fn thread_lifecycle_contributor(
|
|
&mut self,
|
|
contributor: Arc<dyn ThreadLifecycleContributor<C>>,
|
|
) {
|
|
self.thread_lifecycle_contributors.push(contributor);
|
|
}
|
|
|
|
/// Registers one turn-lifecycle contributor.
|
|
pub fn turn_lifecycle_contributor(&mut self, contributor: Arc<dyn TurnLifecycleContributor>) {
|
|
self.turn_lifecycle_contributors.push(contributor);
|
|
}
|
|
|
|
/// Registers one config contributor.
|
|
pub fn config_contributor(&mut self, contributor: Arc<dyn ConfigContributor<C>>) {
|
|
self.config_contributors.push(contributor);
|
|
}
|
|
|
|
/// Registers one token-usage contributor.
|
|
pub fn token_usage_contributor(&mut self, contributor: Arc<dyn TokenUsageContributor>) {
|
|
self.token_usage_contributors.push(contributor);
|
|
}
|
|
|
|
/// Registers one prompt contributor.
|
|
pub fn prompt_contributor(&mut self, contributor: Arc<dyn ContextContributor>) {
|
|
self.context_contributors.push(contributor);
|
|
}
|
|
|
|
/// Registers one runtime MCP server contributor.
|
|
pub fn mcp_server_contributor(&mut self, contributor: Arc<dyn McpServerContributor<C>>) {
|
|
self.mcp_server_contributors.push(contributor);
|
|
}
|
|
|
|
/// Registers one turn-input contributor.
|
|
pub fn turn_input_contributor(&mut self, contributor: Arc<dyn TurnInputContributor>) {
|
|
self.turn_input_contributors.push(contributor);
|
|
}
|
|
|
|
/// Registers one native tool contributor.
|
|
pub fn tool_contributor(&mut self, contributor: Arc<dyn ToolContributor>) {
|
|
self.tool_contributors.push(contributor);
|
|
}
|
|
|
|
/// Registers one tool-lifecycle contributor.
|
|
pub fn tool_lifecycle_contributor(&mut self, contributor: Arc<dyn ToolLifecycleContributor>) {
|
|
self.tool_lifecycle_contributors.push(contributor);
|
|
}
|
|
|
|
/// Registers one ordered turn-item contributor.
|
|
pub fn turn_item_contributor(&mut self, contributor: Arc<dyn TurnItemContributor>) {
|
|
self.turn_item_contributors.push(contributor);
|
|
}
|
|
|
|
/// Finishes construction and returns the immutable registry.
|
|
pub fn build(self) -> ExtensionRegistry<C> {
|
|
ExtensionRegistry {
|
|
event_sink: self.event_sink,
|
|
thread_lifecycle_contributors: self.thread_lifecycle_contributors,
|
|
turn_lifecycle_contributors: self.turn_lifecycle_contributors,
|
|
config_contributors: self.config_contributors,
|
|
token_usage_contributors: self.token_usage_contributors,
|
|
approval_review_contributors: self.approval_review_contributors,
|
|
context_contributors: self.context_contributors,
|
|
mcp_server_contributors: self.mcp_server_contributors,
|
|
turn_input_contributors: self.turn_input_contributors,
|
|
tool_contributors: self.tool_contributors,
|
|
tool_lifecycle_contributors: self.tool_lifecycle_contributors,
|
|
turn_item_contributors: self.turn_item_contributors,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Immutable typed registry produced after extensions are installed.
|
|
pub struct ExtensionRegistry<C: Sync> {
|
|
event_sink: Arc<dyn ExtensionEventSink>,
|
|
thread_lifecycle_contributors: Vec<Arc<dyn ThreadLifecycleContributor<C>>>,
|
|
turn_lifecycle_contributors: Vec<Arc<dyn TurnLifecycleContributor>>,
|
|
config_contributors: Vec<Arc<dyn ConfigContributor<C>>>,
|
|
token_usage_contributors: Vec<Arc<dyn TokenUsageContributor>>,
|
|
context_contributors: Vec<Arc<dyn ContextContributor>>,
|
|
mcp_server_contributors: Vec<Arc<dyn McpServerContributor<C>>>,
|
|
turn_input_contributors: Vec<Arc<dyn TurnInputContributor>>,
|
|
tool_contributors: Vec<Arc<dyn ToolContributor>>,
|
|
tool_lifecycle_contributors: Vec<Arc<dyn ToolLifecycleContributor>>,
|
|
turn_item_contributors: Vec<Arc<dyn TurnItemContributor>>,
|
|
approval_review_contributors: Vec<Arc<dyn ApprovalReviewContributor>>,
|
|
}
|
|
|
|
impl<C: Sync> ExtensionRegistry<C> {
|
|
/// Returns the host event sink retained by this registry.
|
|
pub fn event_sink(&self) -> Arc<dyn ExtensionEventSink> {
|
|
Arc::clone(&self.event_sink)
|
|
}
|
|
|
|
/// Returns the registered thread-lifecycle contributors.
|
|
pub fn thread_lifecycle_contributors(&self) -> &[Arc<dyn ThreadLifecycleContributor<C>>] {
|
|
&self.thread_lifecycle_contributors
|
|
}
|
|
|
|
/// Returns the registered turn-lifecycle contributors.
|
|
pub fn turn_lifecycle_contributors(&self) -> &[Arc<dyn TurnLifecycleContributor>] {
|
|
&self.turn_lifecycle_contributors
|
|
}
|
|
|
|
/// Returns the registered config contributors.
|
|
pub fn config_contributors(&self) -> &[Arc<dyn ConfigContributor<C>>] {
|
|
&self.config_contributors
|
|
}
|
|
|
|
/// Returns the registered token-usage contributors.
|
|
pub fn token_usage_contributors(&self) -> &[Arc<dyn TokenUsageContributor>] {
|
|
&self.token_usage_contributors
|
|
}
|
|
|
|
/// Claims the first rendered approval-review prompt accepted by an
|
|
/// installed contributor.
|
|
pub async fn approval_review(
|
|
&self,
|
|
session_store: &ExtensionData,
|
|
thread_store: &ExtensionData,
|
|
prompt: &str,
|
|
) -> Option<ReviewDecision> {
|
|
for contributor in &self.approval_review_contributors {
|
|
if let Some(decision) = contributor
|
|
.contribute(session_store, thread_store, prompt)
|
|
.await
|
|
{
|
|
return Some(decision);
|
|
}
|
|
}
|
|
|
|
None
|
|
}
|
|
|
|
/// Returns the registered prompt contributors.
|
|
pub fn context_contributors(&self) -> &[Arc<dyn ContextContributor>] {
|
|
&self.context_contributors
|
|
}
|
|
|
|
/// Returns the registered runtime MCP server contributors.
|
|
pub fn mcp_server_contributors(&self) -> &[Arc<dyn McpServerContributor<C>>] {
|
|
&self.mcp_server_contributors
|
|
}
|
|
|
|
/// Returns the registered turn-input contributors.
|
|
pub fn turn_input_contributors(&self) -> &[Arc<dyn TurnInputContributor>] {
|
|
&self.turn_input_contributors
|
|
}
|
|
|
|
/// Returns the registered native tool contributors.
|
|
pub fn tool_contributors(&self) -> &[Arc<dyn ToolContributor>] {
|
|
&self.tool_contributors
|
|
}
|
|
|
|
/// Returns the registered tool-lifecycle contributors.
|
|
pub fn tool_lifecycle_contributors(&self) -> &[Arc<dyn ToolLifecycleContributor>] {
|
|
&self.tool_lifecycle_contributors
|
|
}
|
|
|
|
/// Returns the registered ordered turn-item contributors.
|
|
pub fn turn_item_contributors(&self) -> &[Arc<dyn TurnItemContributor>] {
|
|
&self.turn_item_contributors
|
|
}
|
|
}
|
|
|
|
/// Creates an empty shared registry for hosts that do not register contributions.
|
|
pub fn empty_extension_registry<C: Sync>() -> Arc<ExtensionRegistry<C>> {
|
|
Arc::new(ExtensionRegistryBuilder::new().build())
|
|
}
|