mirror of
https://github.com/openai/codex.git
synced 2026-11-21 22:50:37 +00:00
changes
This commit is contained in:
@@ -82,7 +82,7 @@ Example (from OpenAI's official VSCode extension):
|
||||
- `mcpServerStatus/list` — enumerate configured MCP servers with their tools, resources, resource templates, and auth status; supports cursor+limit pagination.
|
||||
- `feedback/upload` — submit a feedback report (classification + optional reason/logs and conversation_id); returns the tracking thread id.
|
||||
- `command/exec` — run a single command under the server sandbox without starting a thread/turn (handy for utilities and validation).
|
||||
- `config/read` — fetch the effective config on disk after resolving config layering.
|
||||
- `config/read` — fetch the effective config on disk after resolving config layering (thread-agnostic; does not include in-repo `.codex/` layers).
|
||||
- `config/value/write` — write a single config key/value to the user's config.toml on disk.
|
||||
- `config/batchWrite` — apply multiple config edits atomically to the user's config.toml on disk.
|
||||
|
||||
|
||||
@@ -156,7 +156,6 @@ use codex_protocol::protocol::SessionMetaLine;
|
||||
use codex_protocol::protocol::USER_MESSAGE_BEGIN;
|
||||
use codex_protocol::user_input::UserInput as CoreInputItem;
|
||||
use codex_rmcp_client::perform_oauth_login_return_url;
|
||||
use codex_utils_json_to_toml::json_to_toml;
|
||||
use std::collections::HashMap;
|
||||
use std::collections::HashSet;
|
||||
use std::ffi::OsStr;
|
||||
@@ -217,7 +216,6 @@ pub(crate) struct CodexMessageProcessor {
|
||||
codex_linux_sandbox_exe: Option<PathBuf>,
|
||||
config: Arc<Config>,
|
||||
config_api: ConfigApi,
|
||||
cli_overrides: Vec<(String, TomlValue)>,
|
||||
conversation_listeners: HashMap<Uuid, oneshot::Sender<()>>,
|
||||
active_login: Arc<Mutex<Option<ActiveLogin>>>,
|
||||
// Queue of pending interrupt requests per conversation. We reply when TurnAborted arrives.
|
||||
@@ -275,7 +273,6 @@ impl CodexMessageProcessor {
|
||||
codex_linux_sandbox_exe,
|
||||
config,
|
||||
config_api,
|
||||
cli_overrides,
|
||||
conversation_listeners: HashMap::new(),
|
||||
active_login: Arc::new(Mutex::new(None)),
|
||||
pending_interrupts: Arc::new(Mutex::new(HashMap::new())),
|
||||
@@ -1277,8 +1274,7 @@ impl CodexMessageProcessor {
|
||||
}
|
||||
|
||||
let config =
|
||||
match derive_config_from_params(&self.cli_overrides, overrides, Some(cli_overrides))
|
||||
.await
|
||||
match derive_config_from_params(&self.config_api, overrides, Some(cli_overrides)).await
|
||||
{
|
||||
Ok(config) => config,
|
||||
Err(err) => {
|
||||
@@ -1330,7 +1326,7 @@ impl CodexMessageProcessor {
|
||||
);
|
||||
|
||||
let config =
|
||||
match derive_config_from_params(&self.cli_overrides, overrides, params.config).await {
|
||||
match derive_config_from_params(&self.config_api, overrides, params.config).await {
|
||||
Ok(config) => config,
|
||||
Err(err) => {
|
||||
let error = JSONRPCErrorError {
|
||||
@@ -1569,7 +1565,7 @@ impl CodexMessageProcessor {
|
||||
base_instructions,
|
||||
developer_instructions,
|
||||
);
|
||||
match derive_config_from_params(&self.cli_overrides, overrides, cli_overrides).await {
|
||||
match derive_config_from_params(&self.config_api, overrides, cli_overrides).await {
|
||||
Ok(config) => config,
|
||||
Err(err) => {
|
||||
let error = JSONRPCErrorError {
|
||||
@@ -2230,7 +2226,7 @@ impl CodexMessageProcessor {
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
derive_config_from_params(&self.cli_overrides, overrides, Some(cli_overrides)).await
|
||||
derive_config_from_params(&self.config_api, overrides, Some(cli_overrides)).await
|
||||
}
|
||||
None => Ok(self.config.as_ref().clone()),
|
||||
};
|
||||
@@ -3346,21 +3342,13 @@ fn errors_to_info(
|
||||
}
|
||||
|
||||
async fn derive_config_from_params(
|
||||
base_cli_overrides: &[(String, TomlValue)],
|
||||
config_api: &ConfigApi,
|
||||
overrides: ConfigOverrides,
|
||||
cli_overrides: Option<HashMap<String, serde_json::Value>>,
|
||||
) -> std::io::Result<Config> {
|
||||
// Apply the app server's startup `--config` overrides, then apply request-scoped
|
||||
// overrides with higher precedence.
|
||||
let mut merged_cli_overrides: Vec<(String, TomlValue)> = base_cli_overrides.to_vec();
|
||||
merged_cli_overrides.extend(
|
||||
cli_overrides
|
||||
.unwrap_or_default()
|
||||
.into_iter()
|
||||
.map(|(k, v)| (k, json_to_toml(v))),
|
||||
);
|
||||
|
||||
Config::load_with_cli_overrides_and_harness_overrides(merged_cli_overrides, overrides).await
|
||||
config_api
|
||||
.load_thread_agnostic_config(overrides, cli_overrides)
|
||||
.await
|
||||
}
|
||||
|
||||
async fn read_summary_from_rollout(
|
||||
|
||||
@@ -11,6 +11,7 @@ use codex_core::config::Config;
|
||||
use codex_core::config::ConfigBuilder;
|
||||
use codex_core::config::ConfigService;
|
||||
use codex_core::config::ConfigServiceError;
|
||||
use codex_utils_json_to_toml::json_to_toml;
|
||||
use serde_json::json;
|
||||
use std::path::PathBuf;
|
||||
use toml::Value as TomlValue;
|
||||
@@ -38,6 +39,30 @@ impl ConfigApi {
|
||||
self.service.read(params).await.map_err(map_error)
|
||||
}
|
||||
|
||||
pub(crate) async fn load_thread_agnostic_config(
|
||||
&self,
|
||||
overrides: codex_core::config::ConfigOverrides,
|
||||
request_cli_overrides: Option<std::collections::HashMap<String, serde_json::Value>>,
|
||||
) -> std::io::Result<Config> {
|
||||
// Apply the app server's startup `--config` overrides, then apply request-scoped overrides
|
||||
// with higher precedence.
|
||||
let mut merged_cli_overrides = self.cli_overrides.clone();
|
||||
merged_cli_overrides.extend(
|
||||
request_cli_overrides
|
||||
.unwrap_or_default()
|
||||
.into_iter()
|
||||
.map(|(k, v)| (k, json_to_toml(v))),
|
||||
);
|
||||
|
||||
ConfigBuilder::default()
|
||||
.codex_home(self.codex_home.clone())
|
||||
.cli_overrides(merged_cli_overrides)
|
||||
.harness_overrides(overrides)
|
||||
.thread_agnostic()
|
||||
.build()
|
||||
.await
|
||||
}
|
||||
|
||||
pub(crate) async fn write_value(
|
||||
&self,
|
||||
params: ConfigValueWriteParams,
|
||||
@@ -55,11 +80,7 @@ impl ConfigApi {
|
||||
pub(crate) async fn load_latest_thread_agnostic_config(
|
||||
&self,
|
||||
) -> Result<Config, JSONRPCErrorError> {
|
||||
ConfigBuilder::default()
|
||||
.codex_home(self.codex_home.clone())
|
||||
.cli_overrides(self.cli_overrides.clone())
|
||||
.thread_agnostic()
|
||||
.build()
|
||||
self.load_thread_agnostic_config(codex_core::config::ConfigOverrides::default(), None)
|
||||
.await
|
||||
.map_err(|err| JSONRPCErrorError {
|
||||
code: INTERNAL_ERROR_CODE,
|
||||
|
||||
Reference in New Issue
Block a user