Simplification

This commit is contained in:
Eric Traut
2026-03-14 14:32:41 -06:00
parent 75de924cc0
commit 1451ad85b1
4 changed files with 5 additions and 13 deletions

View File

@@ -406,7 +406,6 @@ fn start_uninitialized(args: InProcessStartArgs) -> InProcessClientHandle {
config: args.config,
cli_overrides: args.cli_overrides,
loader_overrides: args.loader_overrides,
cloud_requirements: None,
auth_manager: args.auth_manager,
thread_manager: args.thread_manager,
feedback: args.feedback,

View File

@@ -598,7 +598,6 @@ pub async fn run_main_with_transport(
config: Arc::new(config),
cli_overrides,
loader_overrides,
cloud_requirements: Some(cloud_requirements.clone()),
auth_manager: None,
thread_manager: None,
feedback: feedback.clone(),

View File

@@ -56,7 +56,6 @@ use codex_core::auth::ExternalAuthRefreshReason;
use codex_core::auth::ExternalAuthRefresher;
use codex_core::auth::ExternalAuthTokens;
use codex_core::config::Config;
use codex_core::config_loader::CloudRequirementsLoader;
use codex_core::config_loader::LoaderOverrides;
use codex_core::default_client::SetOriginatorError;
use codex_core::default_client::USER_AGENT_SUFFIX;
@@ -169,7 +168,6 @@ pub(crate) struct MessageProcessorArgs {
pub(crate) config: Arc<Config>,
pub(crate) cli_overrides: Vec<(String, TomlValue)>,
pub(crate) loader_overrides: LoaderOverrides,
pub(crate) cloud_requirements: Option<CloudRequirementsLoader>,
pub(crate) auth_manager: Option<Arc<AuthManager>>,
pub(crate) thread_manager: Option<Arc<ThreadManager>>,
pub(crate) feedback: CodexFeedback,
@@ -189,7 +187,6 @@ impl MessageProcessor {
config,
cli_overrides,
loader_overrides,
cloud_requirements,
auth_manager,
thread_manager,
feedback,
@@ -233,13 +230,11 @@ impl MessageProcessor {
thread_manager
.plugins_manager()
.maybe_start_curated_repo_sync_for_config(&config);
let cloud_requirements = Arc::new(RwLock::new(cloud_requirements.unwrap_or_else(|| {
cloud_requirements_loader(
auth_manager.clone(),
config.chatgpt_base_url.clone(),
config.codex_home.clone(),
)
})));
let cloud_requirements = Arc::new(RwLock::new(cloud_requirements_loader(
auth_manager.clone(),
config.chatgpt_base_url.clone(),
config.codex_home.clone(),
)));
let codex_message_processor = CodexMessageProcessor::new(CodexMessageProcessorArgs {
auth_manager: auth_manager.clone(),
thread_manager: Arc::clone(&thread_manager),

View File

@@ -237,7 +237,6 @@ fn build_test_processor(
config,
cli_overrides: Vec::new(),
loader_overrides: LoaderOverrides::default(),
cloud_requirements: None,
auth_manager: None,
thread_manager: None,
feedback: CodexFeedback::new(),