Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Raise the GPT-5.6 maximum context window (#39102)

Celia Chen2eee483e49f8
diff --git a/codex-rs/model-provider/src/amazon_bedrock/catalog.rs b/codex-rs/model-provider/src/amazon_bedrock/catalog.rs
index 16fc685a84..fb33161b1f 100644
--- a/codex-rs/model-provider/src/amazon_bedrock/catalog.rs
+++ b/codex-rs/model-provider/src/amazon_bedrock/catalog.rs
@@ -8,7 +8,6 @@ use codex_protocol::openai_models::ModelInfo;
use codex_protocol::openai_models::ModelVisibility;
use codex_protocol::openai_models::ModelsResponse;
use codex_protocol::openai_models::ReasoningEffort;
-use codex_protocol::openai_models::ReasoningEffortPreset;
use codex_protocol::openai_models::WebSearchToolType;
const GPT_5_BEDROCK_CONTEXT_WINDOW: i64 = 272_000;
@@ -91,22 +90,18 @@ fn gpt_5_6_bedrock_model(
display_name: &str,
priority: i32,
) -> ModelInfo {
- let openai_model = bundled_openai_model(openai_slug);
- let mut model = gpt_5_bedrock_model(
- GPT_5_5_OPENAI_MODEL_ID,
- bedrock_slug,
- display_name,
- priority,
- );
- model.description = openai_model.description;
- model.default_reasoning_level = openai_model.default_reasoning_level;
- model.multi_agent_version = openai_model.multi_agent_version;
+ let mut model = bundled_openai_model(openai_slug);
+ model.slug = bedrock_slug.to_string();
+ model.display_name = display_name.to_string();
+ model.priority = priority;
+ model.visibility = ModelVisibility::List;
+ model.availability_nux = None;
+ model.upgrade = None;
+ model.use_responses_lite = false;
+ model.tool_mode = None;
model
.supported_reasoning_levels
- .push(ReasoningEffortPreset {
- effort: ReasoningEffort::Max,
- description: "Maximum reasoning depth for the hardest problems".to_string(),
- });
+ .retain(|level| level.effort != ReasoningEffort::Ultra);
model
}
@@ -150,20 +145,50 @@ mod tests {
fn gpt_5_bedrock_models_use_bedrock_context_window() {
let catalog = static_model_catalog();
- for model in catalog.models {
- assert_eq!(
- (
+ assert_eq!(
+ catalog
+ .models
+ .iter()
+ .map(|model| (
+ model.slug.as_str(),
model.context_window,
model.max_context_window,
model.web_search_tool_type,
+ ))
+ .collect::<Vec<_>>(),
+ vec![
+ (
+ AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID,
+ Some(GPT_5_BEDROCK_CONTEXT_WINDOW),
+ Some(872_000),
+ WebSearchToolType::Text,
),
(
+ AMAZON_BEDROCK_GPT_5_6_TERRA_MODEL_ID,
Some(GPT_5_BEDROCK_CONTEXT_WINDOW),
+ Some(872_000),
+ WebSearchToolType::Text,
+ ),
+ (
+ AMAZON_BEDROCK_GPT_5_6_LUNA_MODEL_ID,
Some(GPT_5_BEDROCK_CONTEXT_WINDOW),
+ Some(872_000),
WebSearchToolType::Text,
- )
- );
- }
+ ),
+ (
+ AMAZON_BEDROCK_GPT_5_5_MODEL_ID,
+ Some(GPT_5_BEDROCK_CONTEXT_WINDOW),
+ Some(GPT_5_BEDROCK_CONTEXT_WINDOW),
+ WebSearchToolType::Text,
+ ),
+ (
+ AMAZON_BEDROCK_GPT_5_4_MODEL_ID,
+ Some(GPT_5_BEDROCK_CONTEXT_WINDOW),
+ Some(GPT_5_BEDROCK_CONTEXT_WINDOW),
+ WebSearchToolType::Text,
+ ),
+ ]
+ );
}
#[test]
@@ -204,13 +229,8 @@ mod tests {
}
#[test]
- fn gpt_5_6_bedrock_models_use_variant_metadata_and_max_reasoning_effort() {
+ fn gpt_5_6_bedrock_models_use_bundled_metadata_with_bedrock_overrides() {
let catalog = static_model_catalog();
- let gpt_5_5 = catalog
- .models
- .iter()
- .find(|model| model.slug == AMAZON_BEDROCK_GPT_5_5_MODEL_ID)
- .expect("Bedrock catalog should include GPT-5.5");
for (openai_slug, slug, display_name, priority) in [
(
@@ -232,20 +252,22 @@ mod tests {
2,
),
] {
- let openai_model = bundled_openai_model(openai_slug);
- let mut expected = gpt_5_5.clone();
+ let mut expected = bundled_openai_model(openai_slug);
expected.slug = slug.to_string();
expected.display_name = display_name.to_string();
- expected.description = openai_model.description;
- expected.default_reasoning_level = openai_model.default_reasoning_level;
- expected.multi_agent_version = openai_model.multi_agent_version;
expected.priority = priority;
+ expected.visibility = ModelVisibility::List;
+ expected.availability_nux = None;
+ expected.upgrade = None;
+ expected.use_responses_lite = false;
+ expected.tool_mode = None;
expected
.supported_reasoning_levels
- .push(ReasoningEffortPreset {
- effort: ReasoningEffort::Max,
- description: "Maximum reasoning depth for the hardest problems".to_string(),
- });
+ .retain(|level| level.effort != ReasoningEffort::Ultra);
+ expected.additional_speed_tiers.clear();
+ expected.service_tiers.clear();
+ expected.default_service_tier = None;
+ expected.web_search_tool_type = WebSearchToolType::Text;
assert_eq!(
catalog.models.iter().find(|model| model.slug == slug),
diff --git a/codex-rs/model-provider/src/provider.rs b/codex-rs/model-provider/src/provider.rs
index c17ee367eb..aee4f9a2b5 100644
--- a/codex-rs/model-provider/src/provider.rs
+++ b/codex-rs/model-provider/src/provider.rs
@@ -469,6 +469,7 @@ mod tests {
use codex_model_provider_info::ModelProviderAwsAuthInfo;
use codex_model_provider_info::WireApi;
use codex_model_provider_info::create_oss_provider_with_base_url;
+ use codex_models_manager::ModelsManagerConfig;
use codex_models_manager::manager::RefreshStrategy;
use codex_protocol::account::PlanType;
use codex_protocol::config_types::ModelProviderAuthInfo;
@@ -854,6 +855,21 @@ mod tests {
)
.await;
assert_eq!(uncached_catalog, catalog);
+ let model_info = manager
+ .get_model_info(
+ "openai.gpt-5.6-sol",
+ &ModelsManagerConfig {
+ model_context_window: Some(1_000_000),
+ ..Default::default()
+ },
+ )
+ .await;
+ let mut expected_model_info = manager
+ .get_model_info("openai.gpt-5.6-sol", &ModelsManagerConfig::default())
+ .await;
+ expected_model_info.context_window = Some(872_000);
+ assert_eq!(model_info, expected_model_info);
+
let models = catalog
.models
.iter()
diff --git a/codex-rs/models-manager/models.json b/codex-rs/models-manager/models.json
index 3b6d62393e..413d8eeb74 100644
--- a/codex-rs/models-manager/models.json
+++ b/codex-rs/models-manager/models.json
@@ -24,7 +24,7 @@
"include_apps_usage_instructions": true,
"auto_review_model_override": null,
"context_window": 272000,
- "max_context_window": 272000,
+ "max_context_window": 872000,
"auto_compact_token_limit": null,
"comp_hash": "3000",
"reasoning_summary_format": "experimental",
@@ -138,7 +138,7 @@
"include_apps_usage_instructions": true,
"auto_review_model_override": null,
"context_window": 272000,
- "max_context_window": 272000,
+ "max_context_window": 872000,
"auto_compact_token_limit": null,
"comp_hash": "3000",
"reasoning_summary_format": "experimental",
@@ -250,7 +250,7 @@
"include_apps_usage_instructions": true,
"auto_review_model_override": null,
"context_window": 272000,
- "max_context_window": 272000,
+ "max_context_window": 872000,
"auto_compact_token_limit": null,
"comp_hash": "3000",
"reasoning_summary_format": "experimental",
diff --git a/codex-rs/models-manager/src/manager_tests.rs b/codex-rs/models-manager/src/manager_tests.rs
index 8669a0a34f..74ea9389ec 100644
--- a/codex-rs/models-manager/src/manager_tests.rs
+++ b/codex-rs/models-manager/src/manager_tests.rs
@@ -727,6 +727,29 @@ async fn get_model_info_tracks_fallback_usage() {
assert_eq!(unknown.slug, "model-that-does-not-exist");
}
+#[tokio::test]
+async fn get_model_info_applies_long_context_override_to_bundled_gpt_5_6_models() {
+ let codex_home = tempdir().expect("temp dir");
+ let manager = openai_manager_for_tests(
+ codex_home.path().to_path_buf(),
+ TestModelsEndpoint::new(Vec::new()),
+ );
+ let config = ModelsManagerConfig {
+ model_context_window: Some(1_000_000),
+ ..Default::default()
+ };
+
+ for slug in ["gpt-5.6-sol", "gpt-5.6-terra", "gpt-5.6-luna"] {
+ let model_info = manager.get_model_info(slug, &config).await;
+ let mut expected = manager
+ .get_model_info(slug, &ModelsManagerConfig::default())
+ .await;
+ expected.context_window = Some(872_000);
+
+ assert_eq!(model_info, expected);
+ }
+}
+
#[tokio::test]
async fn get_model_info_uses_custom_catalog() {
let config = ModelsManagerConfig::default();