mirror of
https://github.com/openai/codex.git
synced 2026-11-15 21:50:46 +00:00
[codex-app-server] expose per-surface HTTP state bridge [ci changed_files]
This commit is contained in:
@@ -26,6 +26,7 @@ use crate::request_processors::ExternalAgentConfigRequestProcessor;
|
||||
use crate::request_processors::FeedbackRequestProcessor;
|
||||
use crate::request_processors::FsRequestProcessor;
|
||||
use crate::request_processors::GitRequestProcessor;
|
||||
use crate::request_processors::HttpStateRequestProcessor;
|
||||
use crate::request_processors::InitializeRequestProcessor;
|
||||
use crate::request_processors::MarketplaceRequestProcessor;
|
||||
use crate::request_processors::McpRequestProcessor;
|
||||
@@ -176,6 +177,7 @@ pub(crate) struct MessageProcessor {
|
||||
initialize_processor: InitializeRequestProcessor,
|
||||
marketplace_processor: MarketplaceRequestProcessor,
|
||||
mcp_processor: McpRequestProcessor,
|
||||
http_state_processor: HttpStateRequestProcessor,
|
||||
plugin_processor: PluginRequestProcessor,
|
||||
remote_control_processor: RemoteControlRequestProcessor,
|
||||
search_processor: SearchRequestProcessor,
|
||||
@@ -400,6 +402,7 @@ impl MessageProcessor {
|
||||
outgoing.clone(),
|
||||
config_manager.clone(),
|
||||
);
|
||||
let http_state_processor = HttpStateRequestProcessor::new(config.codex_home.to_path_buf());
|
||||
let plugin_processor = PluginRequestProcessor::new(
|
||||
auth_manager.clone(),
|
||||
Arc::clone(&thread_manager),
|
||||
@@ -503,6 +506,7 @@ impl MessageProcessor {
|
||||
initialize_processor,
|
||||
marketplace_processor,
|
||||
mcp_processor,
|
||||
http_state_processor,
|
||||
plugin_processor,
|
||||
remote_control_processor,
|
||||
search_processor,
|
||||
@@ -932,6 +936,18 @@ impl MessageProcessor {
|
||||
.clients_revoke(params)
|
||||
.await
|
||||
.map(|response| Some(response.into())),
|
||||
ClientRequest::HttpStateGet { .. } => self
|
||||
.http_state_processor
|
||||
.get(app_server_client_name.as_deref())
|
||||
.map(|response| Some(response.into())),
|
||||
ClientRequest::HttpStateSet { params, .. } => self
|
||||
.http_state_processor
|
||||
.set(app_server_client_name.as_deref(), params)
|
||||
.map(|response| Some(response.into())),
|
||||
ClientRequest::HttpStateClear { .. } => self
|
||||
.http_state_processor
|
||||
.clear(app_server_client_name.as_deref())
|
||||
.map(|response| Some(response.into())),
|
||||
ClientRequest::ConfigRequirementsRead { params: _, .. } => self
|
||||
.config_processor
|
||||
.config_requirements_read()
|
||||
|
||||
@@ -463,6 +463,7 @@ mod feedback_doctor_report;
|
||||
mod feedback_processor;
|
||||
mod fs_processor;
|
||||
mod git_processor;
|
||||
mod http_state_processor;
|
||||
mod initialize_processor;
|
||||
mod marketplace_processor;
|
||||
mod mcp_processor;
|
||||
@@ -485,6 +486,7 @@ pub(crate) use external_agent_config_processor::ExternalAgentConfigRequestProces
|
||||
pub(crate) use feedback_processor::FeedbackRequestProcessor;
|
||||
pub(crate) use fs_processor::FsRequestProcessor;
|
||||
pub(crate) use git_processor::GitRequestProcessor;
|
||||
pub(crate) use http_state_processor::HttpStateRequestProcessor;
|
||||
pub(crate) use initialize_processor::InitializeRequestProcessor;
|
||||
pub(crate) use marketplace_processor::MarketplaceRequestProcessor;
|
||||
pub(crate) use mcp_processor::McpRequestProcessor;
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
use std::io;
|
||||
use std::path::PathBuf;
|
||||
|
||||
use codex_app_server_protocol::HttpStateClearResponse;
|
||||
use codex_app_server_protocol::HttpStateGetResponse;
|
||||
use codex_app_server_protocol::HttpStateSetParams;
|
||||
use codex_app_server_protocol::HttpStateSetResponse;
|
||||
use codex_app_server_protocol::JSONRPCErrorError;
|
||||
use codex_http_state::HttpStateStore;
|
||||
use codex_http_state::HttpStateSurface;
|
||||
|
||||
use crate::error_code::internal_error;
|
||||
use crate::error_code::invalid_request;
|
||||
|
||||
#[derive(Clone)]
|
||||
pub(crate) struct HttpStateRequestProcessor {
|
||||
store: HttpStateStore,
|
||||
}
|
||||
|
||||
impl HttpStateRequestProcessor {
|
||||
pub(crate) fn new(codex_home: PathBuf) -> Self {
|
||||
Self {
|
||||
store: HttpStateStore::new(codex_home),
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn get(
|
||||
&self,
|
||||
app_server_client_name: Option<&str>,
|
||||
) -> Result<HttpStateGetResponse, JSONRPCErrorError> {
|
||||
let surface = surface_for_client_name(app_server_client_name)?;
|
||||
let state = self.store.get(surface).map_err(map_get_error)?;
|
||||
Ok(HttpStateGetResponse { state })
|
||||
}
|
||||
|
||||
pub(crate) fn set(
|
||||
&self,
|
||||
app_server_client_name: Option<&str>,
|
||||
params: HttpStateSetParams,
|
||||
) -> Result<HttpStateSetResponse, JSONRPCErrorError> {
|
||||
let surface = surface_for_client_name(app_server_client_name)?;
|
||||
let written = match params.expected_state {
|
||||
Some(expected_state) => {
|
||||
self.store
|
||||
.compare_and_set(surface, &expected_state, params.state)
|
||||
}
|
||||
None => self.store.set(surface, params.state).map(|()| true),
|
||||
}
|
||||
.map_err(map_set_error)?;
|
||||
Ok(HttpStateSetResponse { written })
|
||||
}
|
||||
|
||||
pub(crate) fn clear(
|
||||
&self,
|
||||
app_server_client_name: Option<&str>,
|
||||
) -> Result<HttpStateClearResponse, JSONRPCErrorError> {
|
||||
let surface = surface_for_client_name(app_server_client_name)?;
|
||||
self.store.clear(surface).map_err(map_clear_error)?;
|
||||
Ok(HttpStateClearResponse {})
|
||||
}
|
||||
}
|
||||
|
||||
fn surface_for_client_name(
|
||||
app_server_client_name: Option<&str>,
|
||||
) -> Result<HttpStateSurface, JSONRPCErrorError> {
|
||||
let client_name = app_server_client_name
|
||||
.ok_or_else(|| invalid_request("HTTP state requires an initialized client"))?;
|
||||
HttpStateSurface::try_from_app_server_client_name(client_name).ok_or_else(|| {
|
||||
invalid_request(format!(
|
||||
"HTTP state is unavailable for app-server client {client_name:?}"
|
||||
))
|
||||
})
|
||||
}
|
||||
|
||||
fn map_get_error(error: io::Error) -> JSONRPCErrorError {
|
||||
internal_error(format!("failed to read HTTP state: {error}"))
|
||||
}
|
||||
|
||||
fn map_set_error(error: io::Error) -> JSONRPCErrorError {
|
||||
internal_error(format!("failed to write HTTP state: {error}"))
|
||||
}
|
||||
|
||||
fn map_clear_error(error: io::Error) -> JSONRPCErrorError {
|
||||
internal_error(format!("failed to clear HTTP state: {error}"))
|
||||
}
|
||||
Reference in New Issue
Block a user