Skip to content

Commit d14bf09

Browse files
author
codex-bot
committed
Merge remote-tracking branch 'upstream/main' into sync-upstream-2025-12-12-4
2 parents 07f6b8d + 149696d commit d14bf09

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

‎codex-rs/app-server/tests/common/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ assert_cmd = { workspace = true }
1313
base64 = { workspace = true }
1414
chrono = { workspace = true }
1515
codex-app-server-protocol = { workspace = true }
16-
codex-core = { workspace = true }
16+
codex-core = { workspace = true, features = ["test-support"] }
1717
codex-protocol = { workspace = true }
1818
serde = { workspace = true }
1919
serde_json = { workspace = true }

‎codex-rs/core/src/error.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ pub enum SandboxErr {
5858

5959
#[derive(Error, Debug)]
6060
pub enum CodexErr {
61-
// todo(aibrahim): git rid of this error carrying the dangling artifacts
6261
#[error("turn aborted. Something went wrong? Hit `/feedback` to report the issue.")]
6362
TurnAborted,
6463

‎codex-rs/core/src/openai_models/model_family.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ pub struct ModelFamily {
8383
}
8484

8585
impl ModelFamily {
86-
pub fn with_config_overrides(mut self, config: &Config) -> Self {
86+
pub(super) fn with_config_overrides(mut self, config: &Config) -> Self {
8787
if let Some(supports_reasoning_summaries) = config.model_supports_reasoning_summaries {
8888
self.supports_reasoning_summaries = supports_reasoning_summaries;
8989
}
@@ -98,7 +98,7 @@ impl ModelFamily {
9898
}
9999
self
100100
}
101-
pub fn with_remote_overrides(mut self, remote_models: Vec<ModelInfo>) -> Self {
101+
pub(super) fn with_remote_overrides(mut self, remote_models: Vec<ModelInfo>) -> Self {
102102
for model in remote_models {
103103
if model.slug == self.slug {
104104
self.apply_remote_overrides(model);
@@ -198,7 +198,7 @@ macro_rules! model_family {
198198

199199
/// Internal offline helper for `ModelsManager` that returns a `ModelFamily` for the given
200200
/// model slug.
201-
pub(in crate::openai_models) fn find_family_for_model(slug: &str) -> ModelFamily {
201+
pub(super) fn find_family_for_model(slug: &str) -> ModelFamily {
202202
if slug.starts_with("o3") {
203203
model_family!(
204204
slug, "o3",

‎codex-rs/core/src/openai_models/model_presets.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,15 +237,15 @@ static PRESETS: Lazy<Vec<ModelPreset>> = Lazy::new(|| {
237237
]
238238
});
239239

240-
pub(crate) fn builtin_model_presets(_auth_mode: Option<AuthMode>) -> Vec<ModelPreset> {
240+
pub(super) fn builtin_model_presets(_auth_mode: Option<AuthMode>) -> Vec<ModelPreset> {
241241
PRESETS
242242
.iter()
243243
.filter(|preset| preset.show_in_picker)
244244
.cloned()
245245
.collect()
246246
}
247247

248-
// todo(aibrahim): remove this once we migrate tests
248+
#[cfg(any(test, feature = "test-support"))]
249249
pub fn all_model_presets() -> &'static Vec<ModelPreset> {
250250
&PRESETS
251251
}

0 commit comments

Comments
 (0)