From f0dc6fd3c7ce4389ec21c2914d687e9babb29b50 Mon Sep 17 00:00:00 2001 From: Ahmed Ibrahim Date: Fri, 19 Dec 2025 16:20:05 -0800 Subject: [PATCH] Rename OpenAI models to models manager (#8346) # External (non-OpenAI) Pull Request Requirements Before opening this Pull Request, please read the dedicated "Contributing" markdown file or your PR may be closed: https://github.com/openai/codex/blob/main/docs/contributing.md If your PR conforms to our contribution guidelines, replace this text with a detailed and high quality description of your changes. Include a link to a bug report or enhancement request. --- codex-rs/app-server/tests/common/models_cache.rs | 2 +- codex-rs/core/src/client.rs | 2 +- codex-rs/core/src/client_common.rs | 4 ++-- codex-rs/core/src/codex.rs | 4 ++-- codex-rs/core/src/codex_delegate.rs | 2 +- codex-rs/core/src/conversation_manager.rs | 2 +- codex-rs/core/src/lib.rs | 2 +- .../core/src/{openai_models => models_manager}/cache.rs | 0 .../models_manager.rs => models_manager/manager.rs} | 4 ++-- .../core/src/{openai_models => models_manager}/mod.rs | 4 ++-- .../src/{openai_models => models_manager}/model_family.rs | 0 .../{openai_models => models_manager}/model_presets.rs | 0 codex-rs/core/src/state/service.rs | 2 +- codex-rs/core/src/tasks/mod.rs | 2 +- codex-rs/core/src/tools/spec.rs | 4 ++-- codex-rs/core/tests/chat_completions_payload.rs | 2 +- codex-rs/core/tests/chat_completions_sse.rs | 2 +- codex-rs/core/tests/responses_headers.rs | 2 +- codex-rs/core/tests/suite/client.rs | 2 +- codex-rs/core/tests/suite/remote_models.rs | 2 +- codex-rs/tui/src/app.rs | 8 ++++---- codex-rs/tui/src/chatwidget.rs | 4 ++-- codex-rs/tui/src/chatwidget/tests.rs | 2 +- codex-rs/tui/src/history_cell.rs | 2 +- codex-rs/tui/src/status/card.rs | 2 +- codex-rs/tui/src/status/tests.rs | 4 ++-- codex-rs/tui2/src/app.rs | 8 ++++---- codex-rs/tui2/src/chatwidget.rs | 4 ++-- codex-rs/tui2/src/chatwidget/tests.rs | 2 +- codex-rs/tui2/src/history_cell.rs | 2 +- codex-rs/tui2/src/status/card.rs | 2 +- codex-rs/tui2/src/status/tests.rs | 4 ++-- 32 files changed, 44 insertions(+), 44 deletions(-) rename codex-rs/core/src/{openai_models => models_manager}/cache.rs (100%) rename codex-rs/core/src/{openai_models/models_manager.rs => models_manager/manager.rs} (99%) rename codex-rs/core/src/{openai_models => models_manager}/mod.rs (56%) rename codex-rs/core/src/{openai_models => models_manager}/model_family.rs (100%) rename codex-rs/core/src/{openai_models => models_manager}/model_presets.rs (100%) diff --git a/codex-rs/app-server/tests/common/models_cache.rs b/codex-rs/app-server/tests/common/models_cache.rs index a65ea4b48..acc04e58d 100644 --- a/codex-rs/app-server/tests/common/models_cache.rs +++ b/codex-rs/app-server/tests/common/models_cache.rs @@ -1,6 +1,6 @@ use chrono::DateTime; use chrono::Utc; -use codex_core::openai_models::model_presets::all_model_presets; +use codex_core::models_manager::model_presets::all_model_presets; use codex_protocol::openai_models::ClientVersion; use codex_protocol::openai_models::ConfigShellToolType; use codex_protocol::openai_models::ModelInfo; diff --git a/codex-rs/core/src/client.rs b/codex-rs/core/src/client.rs index aaf3b0ea3..11a3c5c65 100644 --- a/codex-rs/core/src/client.rs +++ b/codex-rs/core/src/client.rs @@ -49,7 +49,7 @@ use crate::features::FEATURES; use crate::flags::CODEX_RS_SSE_FIXTURE; use crate::model_provider_info::ModelProviderInfo; use crate::model_provider_info::WireApi; -use crate::openai_models::model_family::ModelFamily; +use crate::models_manager::model_family::ModelFamily; use crate::tools::spec::create_tools_json_for_chat_completions_api; use crate::tools::spec::create_tools_json_for_responses_api; diff --git a/codex-rs/core/src/client_common.rs b/codex-rs/core/src/client_common.rs index 4a3bc8de2..913bb2232 100644 --- a/codex-rs/core/src/client_common.rs +++ b/codex-rs/core/src/client_common.rs @@ -1,6 +1,6 @@ use crate::client_common::tools::ToolSpec; use crate::error::Result; -use crate::openai_models::model_family::ModelFamily; +use crate::models_manager::model_family::ModelFamily; pub use codex_api::common::ResponseEvent; use codex_apply_patch::APPLY_PATCH_TOOL_INSTRUCTIONS; use codex_protocol::models::ResponseItem; @@ -259,7 +259,7 @@ mod tests { use pretty_assertions::assert_eq; use crate::config::test_config; - use crate::openai_models::models_manager::ModelsManager; + use crate::models_manager::manager::ModelsManager; use super::*; diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs index a659edc77..f96a4d5dc 100644 --- a/codex-rs/core/src/codex.rs +++ b/codex-rs/core/src/codex.rs @@ -16,8 +16,8 @@ use crate::compact_remote::run_inline_remote_auto_compact_task; use crate::exec_policy::load_exec_policy_for_features; use crate::features::Feature; use crate::features::Features; -use crate::openai_models::model_family::ModelFamily; -use crate::openai_models::models_manager::ModelsManager; +use crate::models_manager::manager::ModelsManager; +use crate::models_manager::model_family::ModelFamily; use crate::parse_command::parse_command; use crate::parse_turn_item; use crate::stream_events_utils::HandleOutputCtx; diff --git a/codex-rs/core/src/codex_delegate.rs b/codex-rs/core/src/codex_delegate.rs index 240a26704..9d60684b7 100644 --- a/codex-rs/core/src/codex_delegate.rs +++ b/codex-rs/core/src/codex_delegate.rs @@ -25,7 +25,7 @@ use crate::codex::Session; use crate::codex::TurnContext; use crate::config::Config; use crate::error::CodexErr; -use crate::openai_models::models_manager::ModelsManager; +use crate::models_manager::manager::ModelsManager; use codex_protocol::protocol::InitialHistory; /// Start an interactive sub-Codex conversation and return IO channels. diff --git a/codex-rs/core/src/conversation_manager.rs b/codex-rs/core/src/conversation_manager.rs index 084b73886..5093e03c6 100644 --- a/codex-rs/core/src/conversation_manager.rs +++ b/codex-rs/core/src/conversation_manager.rs @@ -10,7 +10,7 @@ use crate::codex_conversation::CodexConversation; use crate::config::Config; use crate::error::CodexErr; use crate::error::Result as CodexResult; -use crate::openai_models::models_manager::ModelsManager; +use crate::models_manager::manager::ModelsManager; use crate::protocol::Event; use crate::protocol::EventMsg; use crate::protocol::SessionConfiguredEvent; diff --git a/codex-rs/core/src/lib.rs b/codex-rs/core/src/lib.rs index 4eeb1746b..879448408 100644 --- a/codex-rs/core/src/lib.rs +++ b/codex-rs/core/src/lib.rs @@ -33,7 +33,7 @@ pub mod git_info; pub mod landlock; pub mod mcp; mod mcp_connection_manager; -pub mod openai_models; +pub mod models_manager; pub use mcp_connection_manager::MCP_SANDBOX_STATE_CAPABILITY; pub use mcp_connection_manager::MCP_SANDBOX_STATE_METHOD; pub use mcp_connection_manager::SandboxState; diff --git a/codex-rs/core/src/openai_models/cache.rs b/codex-rs/core/src/models_manager/cache.rs similarity index 100% rename from codex-rs/core/src/openai_models/cache.rs rename to codex-rs/core/src/models_manager/cache.rs diff --git a/codex-rs/core/src/openai_models/models_manager.rs b/codex-rs/core/src/models_manager/manager.rs similarity index 99% rename from codex-rs/core/src/openai_models/models_manager.rs rename to codex-rs/core/src/models_manager/manager.rs index 7f54c4f85..315380ade 100644 --- a/codex-rs/core/src/openai_models/models_manager.rs +++ b/codex-rs/core/src/models_manager/manager.rs @@ -24,8 +24,8 @@ use crate::default_client::build_reqwest_client; use crate::error::Result as CoreResult; use crate::features::Feature; use crate::model_provider_info::ModelProviderInfo; -use crate::openai_models::model_family::ModelFamily; -use crate::openai_models::model_presets::builtin_model_presets; +use crate::models_manager::model_family::ModelFamily; +use crate::models_manager::model_presets::builtin_model_presets; const MODEL_CACHE_FILE: &str = "models_cache.json"; const DEFAULT_MODEL_CACHE_TTL: Duration = Duration::from_secs(300); diff --git a/codex-rs/core/src/openai_models/mod.rs b/codex-rs/core/src/models_manager/mod.rs similarity index 56% rename from codex-rs/core/src/openai_models/mod.rs rename to codex-rs/core/src/models_manager/mod.rs index a77438ebc..83ed30e87 100644 --- a/codex-rs/core/src/openai_models/mod.rs +++ b/codex-rs/core/src/models_manager/mod.rs @@ -1,4 +1,4 @@ -mod cache; +pub mod cache; +pub mod manager; pub mod model_family; pub mod model_presets; -pub mod models_manager; diff --git a/codex-rs/core/src/openai_models/model_family.rs b/codex-rs/core/src/models_manager/model_family.rs similarity index 100% rename from codex-rs/core/src/openai_models/model_family.rs rename to codex-rs/core/src/models_manager/model_family.rs diff --git a/codex-rs/core/src/openai_models/model_presets.rs b/codex-rs/core/src/models_manager/model_presets.rs similarity index 100% rename from codex-rs/core/src/openai_models/model_presets.rs rename to codex-rs/core/src/models_manager/model_presets.rs diff --git a/codex-rs/core/src/state/service.rs b/codex-rs/core/src/state/service.rs index e06691955..722c86274 100644 --- a/codex-rs/core/src/state/service.rs +++ b/codex-rs/core/src/state/service.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use crate::AuthManager; use crate::RolloutRecorder; use crate::mcp_connection_manager::McpConnectionManager; -use crate::openai_models::models_manager::ModelsManager; +use crate::models_manager::manager::ModelsManager; use crate::skills::SkillsManager; use crate::tools::sandboxing::ApprovalStore; use crate::unified_exec::UnifiedExecSessionManager; diff --git a/codex-rs/core/src/tasks/mod.rs b/codex-rs/core/src/tasks/mod.rs index b5aaf2999..4601f9d24 100644 --- a/codex-rs/core/src/tasks/mod.rs +++ b/codex-rs/core/src/tasks/mod.rs @@ -19,7 +19,7 @@ use tracing::warn; use crate::AuthManager; use crate::codex::Session; use crate::codex::TurnContext; -use crate::openai_models::models_manager::ModelsManager; +use crate::models_manager::manager::ModelsManager; use crate::protocol::EventMsg; use crate::protocol::TaskCompleteEvent; use crate::protocol::TurnAbortReason; diff --git a/codex-rs/core/src/tools/spec.rs b/codex-rs/core/src/tools/spec.rs index 35ebaf736..0ac91755c 100644 --- a/codex-rs/core/src/tools/spec.rs +++ b/codex-rs/core/src/tools/spec.rs @@ -2,7 +2,7 @@ use crate::client_common::tools::ResponsesApiTool; use crate::client_common::tools::ToolSpec; use crate::features::Feature; use crate::features::Features; -use crate::openai_models::model_family::ModelFamily; +use crate::models_manager::model_family::ModelFamily; use crate::tools::handlers::PLAN_TOOL; use crate::tools::handlers::apply_patch::create_apply_patch_freeform_tool; use crate::tools::handlers::apply_patch::create_apply_patch_json_tool; @@ -1126,7 +1126,7 @@ pub(crate) fn build_specs( mod tests { use crate::client_common::tools::FreeformTool; use crate::config::test_config; - use crate::openai_models::models_manager::ModelsManager; + use crate::models_manager::manager::ModelsManager; use crate::tools::registry::ConfiguredToolSpec; use mcp_types::ToolInputSchema; use pretty_assertions::assert_eq; diff --git a/codex-rs/core/tests/chat_completions_payload.rs b/codex-rs/core/tests/chat_completions_payload.rs index 586793547..8af5df216 100644 --- a/codex-rs/core/tests/chat_completions_payload.rs +++ b/codex-rs/core/tests/chat_completions_payload.rs @@ -12,7 +12,7 @@ use codex_core::ModelProviderInfo; use codex_core::Prompt; use codex_core::ResponseItem; use codex_core::WireApi; -use codex_core::openai_models::models_manager::ModelsManager; +use codex_core::models_manager::manager::ModelsManager; use codex_otel::otel_manager::OtelManager; use codex_protocol::ConversationId; use codex_protocol::models::ReasoningItemContent; diff --git a/codex-rs/core/tests/chat_completions_sse.rs b/codex-rs/core/tests/chat_completions_sse.rs index f58b03922..4f0583827 100644 --- a/codex-rs/core/tests/chat_completions_sse.rs +++ b/codex-rs/core/tests/chat_completions_sse.rs @@ -11,7 +11,7 @@ use codex_core::Prompt; use codex_core::ResponseEvent; use codex_core::ResponseItem; use codex_core::WireApi; -use codex_core::openai_models::models_manager::ModelsManager; +use codex_core::models_manager::manager::ModelsManager; use codex_otel::otel_manager::OtelManager; use codex_protocol::ConversationId; use codex_protocol::models::ReasoningItemContent; diff --git a/codex-rs/core/tests/responses_headers.rs b/codex-rs/core/tests/responses_headers.rs index 5c32685cc..c406fdbc8 100644 --- a/codex-rs/core/tests/responses_headers.rs +++ b/codex-rs/core/tests/responses_headers.rs @@ -10,7 +10,7 @@ use codex_core::Prompt; use codex_core::ResponseEvent; use codex_core::ResponseItem; use codex_core::WireApi; -use codex_core::openai_models::models_manager::ModelsManager; +use codex_core::models_manager::manager::ModelsManager; use codex_otel::otel_manager::OtelManager; use codex_protocol::ConversationId; use codex_protocol::config_types::ReasoningSummary; diff --git a/codex-rs/core/tests/suite/client.rs b/codex-rs/core/tests/suite/client.rs index bda232433..a22027f99 100644 --- a/codex-rs/core/tests/suite/client.rs +++ b/codex-rs/core/tests/suite/client.rs @@ -16,7 +16,7 @@ use codex_core::auth::AuthCredentialsStoreMode; use codex_core::built_in_model_providers; use codex_core::error::CodexErr; use codex_core::features::Feature; -use codex_core::openai_models::models_manager::ModelsManager; +use codex_core::models_manager::manager::ModelsManager; use codex_core::protocol::EventMsg; use codex_core::protocol::Op; use codex_core::protocol::SessionSource; diff --git a/codex-rs/core/tests/suite/remote_models.rs b/codex-rs/core/tests/suite/remote_models.rs index 3c4d389ec..f4102df0d 100644 --- a/codex-rs/core/tests/suite/remote_models.rs +++ b/codex-rs/core/tests/suite/remote_models.rs @@ -10,7 +10,7 @@ use codex_core::ModelProviderInfo; use codex_core::built_in_model_providers; use codex_core::config::Config; use codex_core::features::Feature; -use codex_core::openai_models::models_manager::ModelsManager; +use codex_core::models_manager::manager::ModelsManager; use codex_core::protocol::AskForApproval; use codex_core::protocol::EventMsg; use codex_core::protocol::ExecCommandSource; diff --git a/codex-rs/tui/src/app.rs b/codex-rs/tui/src/app.rs index d03fc7100..14b785ec9 100644 --- a/codex-rs/tui/src/app.rs +++ b/codex-rs/tui/src/app.rs @@ -25,9 +25,9 @@ use codex_core::config::edit::ConfigEdit; use codex_core::config::edit::ConfigEditsBuilder; #[cfg(target_os = "windows")] use codex_core::features::Feature; -use codex_core::openai_models::model_presets::HIDE_GPT_5_1_CODEX_MAX_MIGRATION_PROMPT_CONFIG; -use codex_core::openai_models::model_presets::HIDE_GPT5_1_MIGRATION_PROMPT_CONFIG; -use codex_core::openai_models::models_manager::ModelsManager; +use codex_core::models_manager::manager::ModelsManager; +use codex_core::models_manager::model_presets::HIDE_GPT_5_1_CODEX_MAX_MIGRATION_PROMPT_CONFIG; +use codex_core::models_manager::model_presets::HIDE_GPT5_1_MIGRATION_PROMPT_CONFIG; use codex_core::protocol::EventMsg; use codex_core::protocol::FinalOutput; use codex_core::protocol::ListSkillsResponseEvent; @@ -1341,7 +1341,7 @@ mod tests { } fn all_model_presets() -> Vec { - codex_core::openai_models::model_presets::all_model_presets().clone() + codex_core::models_manager::model_presets::all_model_presets().clone() } #[tokio::test] diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs index 6a312e932..5b0037a2c 100644 --- a/codex-rs/tui/src/chatwidget.rs +++ b/codex-rs/tui/src/chatwidget.rs @@ -14,8 +14,8 @@ use codex_core::features::FEATURES; use codex_core::features::Feature; use codex_core::git_info::current_branch_name; use codex_core::git_info::local_git_branches; -use codex_core::openai_models::model_family::ModelFamily; -use codex_core::openai_models::models_manager::ModelsManager; +use codex_core::models_manager::manager::ModelsManager; +use codex_core::models_manager::model_family::ModelFamily; use codex_core::project_doc::DEFAULT_PROJECT_DOC_FILENAME; use codex_core::protocol::AgentMessageDeltaEvent; use codex_core::protocol::AgentMessageEvent; diff --git a/codex-rs/tui/src/chatwidget/tests.rs b/codex-rs/tui/src/chatwidget/tests.rs index 344208f73..c991c8404 100644 --- a/codex-rs/tui/src/chatwidget/tests.rs +++ b/codex-rs/tui/src/chatwidget/tests.rs @@ -11,7 +11,7 @@ use codex_core::config::Config; use codex_core::config::ConfigBuilder; use codex_core::config::Constrained; use codex_core::config::ConstraintError; -use codex_core::openai_models::models_manager::ModelsManager; +use codex_core::models_manager::manager::ModelsManager; use codex_core::protocol::AgentMessageDeltaEvent; use codex_core::protocol::AgentMessageEvent; use codex_core::protocol::AgentReasoningDeltaEvent; diff --git a/codex-rs/tui/src/history_cell.rs b/codex-rs/tui/src/history_cell.rs index 08f21bdec..0b768dfb2 100644 --- a/codex-rs/tui/src/history_cell.rs +++ b/codex-rs/tui/src/history_cell.rs @@ -1759,7 +1759,7 @@ mod tests { use codex_core::config::ConfigBuilder; use codex_core::config::types::McpServerConfig; use codex_core::config::types::McpServerTransportConfig; - use codex_core::openai_models::models_manager::ModelsManager; + use codex_core::models_manager::manager::ModelsManager; use codex_core::protocol::McpAuthStatus; use codex_protocol::parse_command::ParsedCommand; use dirs::home_dir; diff --git a/codex-rs/tui/src/status/card.rs b/codex-rs/tui/src/status/card.rs index 852efc476..429134362 100644 --- a/codex-rs/tui/src/status/card.rs +++ b/codex-rs/tui/src/status/card.rs @@ -7,7 +7,7 @@ use chrono::DateTime; use chrono::Local; use codex_common::create_config_summary_entries; use codex_core::config::Config; -use codex_core::openai_models::model_family::ModelFamily; +use codex_core::models_manager::model_family::ModelFamily; use codex_core::protocol::NetworkAccess; use codex_core::protocol::SandboxPolicy; use codex_core::protocol::TokenUsage; diff --git a/codex-rs/tui/src/status/tests.rs b/codex-rs/tui/src/status/tests.rs index 893661908..317a3d327 100644 --- a/codex-rs/tui/src/status/tests.rs +++ b/codex-rs/tui/src/status/tests.rs @@ -7,8 +7,8 @@ use chrono::Utc; use codex_core::AuthManager; use codex_core::config::Config; use codex_core::config::ConfigBuilder; -use codex_core::openai_models::model_family::ModelFamily; -use codex_core::openai_models::models_manager::ModelsManager; +use codex_core::models_manager::manager::ModelsManager; +use codex_core::models_manager::model_family::ModelFamily; use codex_core::protocol::CreditsSnapshot; use codex_core::protocol::RateLimitSnapshot; use codex_core::protocol::RateLimitWindow; diff --git a/codex-rs/tui2/src/app.rs b/codex-rs/tui2/src/app.rs index 3f2ac5899..f0655ad71 100644 --- a/codex-rs/tui2/src/app.rs +++ b/codex-rs/tui2/src/app.rs @@ -32,9 +32,9 @@ use codex_core::config::Config; use codex_core::config::edit::ConfigEditsBuilder; #[cfg(target_os = "windows")] use codex_core::features::Feature; -use codex_core::openai_models::model_presets::HIDE_GPT_5_1_CODEX_MAX_MIGRATION_PROMPT_CONFIG; -use codex_core::openai_models::model_presets::HIDE_GPT5_1_MIGRATION_PROMPT_CONFIG; -use codex_core::openai_models::models_manager::ModelsManager; +use codex_core::models_manager::manager::ModelsManager; +use codex_core::models_manager::model_presets::HIDE_GPT_5_1_CODEX_MAX_MIGRATION_PROMPT_CONFIG; +use codex_core::models_manager::model_presets::HIDE_GPT5_1_MIGRATION_PROMPT_CONFIG; use codex_core::protocol::EventMsg; use codex_core::protocol::FinalOutput; use codex_core::protocol::ListSkillsResponseEvent; @@ -2233,7 +2233,7 @@ mod tests { } fn all_model_presets() -> Vec { - codex_core::openai_models::model_presets::all_model_presets().clone() + codex_core::models_manager::model_presets::all_model_presets().clone() } #[tokio::test] diff --git a/codex-rs/tui2/src/chatwidget.rs b/codex-rs/tui2/src/chatwidget.rs index f8b6bc5a5..f7e1d2677 100644 --- a/codex-rs/tui2/src/chatwidget.rs +++ b/codex-rs/tui2/src/chatwidget.rs @@ -12,8 +12,8 @@ use codex_core::config::ConstraintResult; use codex_core::config::types::Notifications; use codex_core::git_info::current_branch_name; use codex_core::git_info::local_git_branches; -use codex_core::openai_models::model_family::ModelFamily; -use codex_core::openai_models::models_manager::ModelsManager; +use codex_core::models_manager::manager::ModelsManager; +use codex_core::models_manager::model_family::ModelFamily; use codex_core::project_doc::DEFAULT_PROJECT_DOC_FILENAME; use codex_core::protocol::AgentMessageDeltaEvent; use codex_core::protocol::AgentMessageEvent; diff --git a/codex-rs/tui2/src/chatwidget/tests.rs b/codex-rs/tui2/src/chatwidget/tests.rs index fee5a837f..7149d2a58 100644 --- a/codex-rs/tui2/src/chatwidget/tests.rs +++ b/codex-rs/tui2/src/chatwidget/tests.rs @@ -10,7 +10,7 @@ use codex_core::CodexAuth; use codex_core::config::Config; use codex_core::config::ConfigBuilder; use codex_core::config::Constrained; -use codex_core::openai_models::models_manager::ModelsManager; +use codex_core::models_manager::manager::ModelsManager; use codex_core::protocol::AgentMessageDeltaEvent; use codex_core::protocol::AgentMessageEvent; use codex_core::protocol::AgentReasoningDeltaEvent; diff --git a/codex-rs/tui2/src/history_cell.rs b/codex-rs/tui2/src/history_cell.rs index df4144821..f9fd36b92 100644 --- a/codex-rs/tui2/src/history_cell.rs +++ b/codex-rs/tui2/src/history_cell.rs @@ -1517,7 +1517,7 @@ mod tests { use codex_core::config::ConfigBuilder; use codex_core::config::types::McpServerConfig; use codex_core::config::types::McpServerTransportConfig; - use codex_core::openai_models::models_manager::ModelsManager; + use codex_core::models_manager::manager::ModelsManager; use codex_core::protocol::McpAuthStatus; use codex_protocol::parse_command::ParsedCommand; use dirs::home_dir; diff --git a/codex-rs/tui2/src/status/card.rs b/codex-rs/tui2/src/status/card.rs index 852efc476..429134362 100644 --- a/codex-rs/tui2/src/status/card.rs +++ b/codex-rs/tui2/src/status/card.rs @@ -7,7 +7,7 @@ use chrono::DateTime; use chrono::Local; use codex_common::create_config_summary_entries; use codex_core::config::Config; -use codex_core::openai_models::model_family::ModelFamily; +use codex_core::models_manager::model_family::ModelFamily; use codex_core::protocol::NetworkAccess; use codex_core::protocol::SandboxPolicy; use codex_core::protocol::TokenUsage; diff --git a/codex-rs/tui2/src/status/tests.rs b/codex-rs/tui2/src/status/tests.rs index 893661908..317a3d327 100644 --- a/codex-rs/tui2/src/status/tests.rs +++ b/codex-rs/tui2/src/status/tests.rs @@ -7,8 +7,8 @@ use chrono::Utc; use codex_core::AuthManager; use codex_core::config::Config; use codex_core::config::ConfigBuilder; -use codex_core::openai_models::model_family::ModelFamily; -use codex_core::openai_models::models_manager::ModelsManager; +use codex_core::models_manager::manager::ModelsManager; +use codex_core::models_manager::model_family::ModelFamily; use codex_core::protocol::CreditsSnapshot; use codex_core::protocol::RateLimitSnapshot; use codex_core::protocol::RateLimitWindow;