Lightweight coding agent that runs in your terminal
Rust
Add GPT-6 Sol and Luna to Amazon Bedrock catalogs (#47347)
Celia Chendf3094107210
diff --git a/codex-rs/app-server/tests/suite/v2/thread_start.rs b/codex-rs/app-server/tests/suite/v2/thread_start.rsindex 00f25e78d2..cd59f9f7cc 100644--- a/codex-rs/app-server/tests/suite/v2/thread_start.rs+++ b/codex-rs/app-server/tests/suite/v2/thread_start.rs@@ -115,7 +115,7 @@ model = "gpt-5.4-mini"}).await?;- assert_eq!(response.model, "openai.gpt-5.6-sol");+ assert_eq!(response.model, "openai.gpt-6-sol");Ok(())}@@ -244,6 +244,16 @@ async fn thread_start_provider_model_fallback_uses_bedrock_static_catalog() -> R/*allow_provider_model_fallback*/ true,).await?;+ for model in [+ "openai.gpt-6-sol",+ "openai.gpt-6-luna",+ "openai.gpt-5.6-sol",+ ] {+ let response =+ start_thread_with_model(&mut mcp, model, /*allow_provider_model_fallback*/ true)+ .await?;+ assert_eq!(response.model, model);+ }let supported_with_fallback = start_thread_with_model(&mut mcp,"openai.gpt-5.4",@@ -263,7 +273,7 @@ async fn thread_start_provider_model_fallback_uses_bedrock_static_catalog() -> Rsupported_with_fallback.model,unsupported_without_fallback.model,],- vec!["openai.gpt-5.6-sol", "openai.gpt-5.4", "gpt-5.4-mini"]+ vec!["openai.gpt-6-sol", "openai.gpt-5.4", "gpt-5.4-mini"]);Ok(())}@@ -281,7 +291,14 @@ async fn thread_start_bedrock_runtime_prefers_global_cross_region_models() -> Re.build_initialized().await?;- for model in ["global.openai.gpt-5.6-sol", "us.openai.gpt-5.6-sol"] {+ for model in [+ "global.openai.gpt-6-sol",+ "us.openai.gpt-6-sol",+ "global.openai.gpt-6-luna",+ "us.openai.gpt-6-luna",+ "global.openai.gpt-5.6-sol",+ "us.openai.gpt-5.6-sol",+ ] {let response =start_thread_with_model(&mut mcp, model, /*allow_provider_model_fallback*/ true).await?;@@ -294,7 +311,7 @@ async fn thread_start_bedrock_runtime_prefers_global_cross_region_models() -> Re/*allow_provider_model_fallback*/ true,).await?;- assert_eq!(response.model, "global.openai.gpt-5.6-sol");+ assert_eq!(response.model, "global.openai.gpt-6-sol");Ok(())}diff --git a/codex-rs/model-provider-info/src/lib.rs b/codex-rs/model-provider-info/src/lib.rsindex 3be93a6830..9de61980f1 100644--- a/codex-rs/model-provider-info/src/lib.rs+++ b/codex-rs/model-provider-info/src/lib.rs@@ -82,6 +82,8 @@ pub const AMAZON_BEDROCK_RUNTIME_PROVIDER_ID: &str = "amazon-bedrock-runtime";pub const AMAZON_BEDROCK_GPT_5_5_MODEL_ID: &str = "openai.gpt-5.5";pub const AMAZON_BEDROCK_GPT_5_4_MODEL_ID: &str = "openai.gpt-5.4";pub const AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID: &str = "openai.gpt-5.6-sol";+pub const AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID: &str = "openai.gpt-6-sol";+pub const AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID: &str = "openai.gpt-6-luna";pub const AMAZON_BEDROCK_GPT_6_ASTRA_MODEL_ID: &str = "openai.gpt-6-astra";pub const AMAZON_BEDROCK_GPT_5_6_TERRA_MODEL_ID: &str = "openai.gpt-5.6-terra";pub const AMAZON_BEDROCK_GPT_5_6_LUNA_MODEL_ID: &str = "openai.gpt-5.6-luna";diff --git a/codex-rs/model-provider/src/amazon_bedrock/catalog.rs b/codex-rs/model-provider/src/amazon_bedrock/catalog.rsindex ff2a49307b..6117a832bb 100644--- a/codex-rs/model-provider/src/amazon_bedrock/catalog.rs+++ b/codex-rs/model-provider/src/amazon_bedrock/catalog.rs@@ -4,6 +4,8 @@ use codex_model_provider_info::AMAZON_BEDROCK_GPT_5_6_LUNA_MODEL_ID;use codex_model_provider_info::AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID;use codex_model_provider_info::AMAZON_BEDROCK_GPT_5_6_TERRA_MODEL_ID;use codex_model_provider_info::AMAZON_BEDROCK_GPT_6_ASTRA_MODEL_ID;+use codex_model_provider_info::AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID;+use codex_model_provider_info::AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID;use codex_models_manager::bundled_models_response;use codex_protocol::openai_models::ModelInfo;use codex_protocol::openai_models::ModelVisibility;@@ -16,6 +18,8 @@ const GPT_5_BEDROCK_CONTEXT_WINDOW: i64 = 272_000;const GPT_5_6_SOL_OPENAI_MODEL_ID: &str = "gpt-5.6-sol";const GPT_5_6_TERRA_OPENAI_MODEL_ID: &str = "gpt-5.6-terra";const GPT_5_6_LUNA_OPENAI_MODEL_ID: &str = "gpt-5.6-luna";+const GPT_6_SOL_OPENAI_MODEL_ID: &str = "gpt-6-sol";+const GPT_6_LUNA_OPENAI_MODEL_ID: &str = "gpt-6-luna";const GPT_6_ASTRA_OPENAI_MODEL_ID: &str = "gpt-6-astra";const GPT_5_5_OPENAI_MODEL_ID: &str = "gpt-5.5";const GPT_5_4_OPENAI_MODEL_ID: &str = "gpt-5.4";@@ -24,9 +28,9 @@ pub(crate) fn static_model_catalog() -> ModelsResponse {normalize_bedrock_catalog(ModelsResponse {models: vec![bedrock_model(- bundled_openai_model(GPT_5_6_SOL_OPENAI_MODEL_ID),- AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID,- "GPT-5.6 Sol",+ bundled_openai_model(GPT_6_SOL_OPENAI_MODEL_ID),+ AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID,+ "GPT-6 Sol",/*priority*/ 0,),bedrock_model(@@ -35,29 +39,41 @@ pub(crate) fn static_model_catalog() -> ModelsResponse {"GPT-6-Astra",/*priority*/ 1,),+ bedrock_model(+ bundled_openai_model(GPT_6_LUNA_OPENAI_MODEL_ID),+ AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID,+ "GPT-6 Luna",+ /*priority*/ 2,+ ),+ bedrock_model(+ bundled_openai_model(GPT_5_6_SOL_OPENAI_MODEL_ID),+ AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID,+ "GPT-5.6 Sol",+ /*priority*/ 3,+ ),bedrock_model(bundled_openai_model(GPT_5_6_TERRA_OPENAI_MODEL_ID),AMAZON_BEDROCK_GPT_5_6_TERRA_MODEL_ID,"GPT-5.6 Terra",- /*priority*/ 2,+ /*priority*/ 4,),bedrock_model(bundled_openai_model(GPT_5_6_LUNA_OPENAI_MODEL_ID),AMAZON_BEDROCK_GPT_5_6_LUNA_MODEL_ID,"GPT-5.6 Luna",- /*priority*/ 3,+ /*priority*/ 5,),gpt_5_bedrock_model(GPT_5_5_OPENAI_MODEL_ID,AMAZON_BEDROCK_GPT_5_5_MODEL_ID,"GPT-5.5",- /*priority*/ 4,+ /*priority*/ 6,),gpt_5_bedrock_model(GPT_5_4_OPENAI_MODEL_ID,AMAZON_BEDROCK_GPT_5_4_MODEL_ID,"GPT-5.4",- /*priority*/ 5,+ /*priority*/ 7,),],})@@ -142,8 +158,10 @@ mod tests {.map(|model| model.slug.as_str()).collect::<Vec<_>>(),vec![- AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID,+ AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID,AMAZON_BEDROCK_GPT_6_ASTRA_MODEL_ID,+ AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID,+ AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID,AMAZON_BEDROCK_GPT_5_6_TERRA_MODEL_ID,AMAZON_BEDROCK_GPT_5_6_LUNA_MODEL_ID,AMAZON_BEDROCK_GPT_5_5_MODEL_ID,@@ -169,7 +187,7 @@ mod tests {.collect::<Vec<_>>(),vec![(- AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID,+ AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID,Some(GPT_5_BEDROCK_CONTEXT_WINDOW),Some(872_000),WebSearchToolType::Text,@@ -180,6 +198,18 @@ mod tests {Some(872_000),WebSearchToolType::Text,),+ (+ AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID,+ Some(GPT_5_BEDROCK_CONTEXT_WINDOW),+ Some(872_000),+ WebSearchToolType::Text,+ ),+ (+ 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),@@ -251,23 +281,35 @@ mod tests {let catalog = static_model_catalog();for (mut expected, slug, display_name, priority) in [+ (+ bundled_openai_model(GPT_6_SOL_OPENAI_MODEL_ID),+ AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID,+ "GPT-6 Sol",+ 0,+ ),+ (+ bundled_openai_model(GPT_6_LUNA_OPENAI_MODEL_ID),+ AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID,+ "GPT-6 Luna",+ 2,+ ),(bundled_openai_model(GPT_5_6_SOL_OPENAI_MODEL_ID),AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID,"GPT-5.6 Sol",- 0,+ 3,),(bundled_openai_model(GPT_5_6_TERRA_OPENAI_MODEL_ID),AMAZON_BEDROCK_GPT_5_6_TERRA_MODEL_ID,"GPT-5.6 Terra",- 2,+ 4,),(bundled_openai_model(GPT_5_6_LUNA_OPENAI_MODEL_ID),AMAZON_BEDROCK_GPT_5_6_LUNA_MODEL_ID,"GPT-5.6 Luna",- 3,+ 5,),(bundled_openai_model(GPT_6_ASTRA_OPENAI_MODEL_ID),diff --git a/codex-rs/model-provider/src/amazon_bedrock/runtime_catalog.rs b/codex-rs/model-provider/src/amazon_bedrock/runtime_catalog.rsindex b442f7b19a..abe435a920 100644--- a/codex-rs/model-provider/src/amazon_bedrock/runtime_catalog.rs+++ b/codex-rs/model-provider/src/amazon_bedrock/runtime_catalog.rs@@ -2,6 +2,8 @@ use codex_model_provider_info::AMAZON_BEDROCK_GPT_5_6_LUNA_MODEL_ID;use codex_model_provider_info::AMAZON_BEDROCK_GPT_5_6_SOL_MODEL_ID;use codex_model_provider_info::AMAZON_BEDROCK_GPT_5_6_TERRA_MODEL_ID;use codex_model_provider_info::AMAZON_BEDROCK_GPT_6_ASTRA_MODEL_ID;+use codex_model_provider_info::AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID;+use codex_model_provider_info::AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID;use codex_protocol::openai_models::ModelsResponse;use super::catalog::static_model_catalog;@@ -20,6 +22,8 @@ pub(super) fn static_runtime_model_catalog() -> ModelsResponse {| AMAZON_BEDROCK_GPT_5_6_TERRA_MODEL_ID| AMAZON_BEDROCK_GPT_5_6_LUNA_MODEL_ID| AMAZON_BEDROCK_GPT_6_ASTRA_MODEL_ID+ | AMAZON_BEDROCK_GPT_6_SOL_MODEL_ID+ | AMAZON_BEDROCK_GPT_6_LUNA_MODEL_ID)}).collect::<Vec<_>>();diff --git a/codex-rs/model-provider/src/amazon_bedrock/runtime_catalog_tests.rs b/codex-rs/model-provider/src/amazon_bedrock/runtime_catalog_tests.rsindex 80d55f7d8e..defb74fdc1 100644--- a/codex-rs/model-provider/src/amazon_bedrock/runtime_catalog_tests.rs+++ b/codex-rs/model-provider/src/amazon_bedrock/runtime_catalog_tests.rs@@ -18,21 +18,25 @@ fn runtime_catalog_includes_supported_cross_region_models_in_priority_order() {)).collect::<Vec<_>>(),vec![- ("global.openai.gpt-5.6-sol", "GPT-5.6 Sol (Global)", 0),+ ("global.openai.gpt-6-sol", "GPT-6 Sol (Global)", 0),("global.openai.gpt-6-astra", "GPT-6-Astra (Global)", 1),- ("global.openai.gpt-5.6-terra", "GPT-5.6 Terra (Global)", 2),- ("global.openai.gpt-5.6-luna", "GPT-5.6 Luna (Global)", 3),- ("us.openai.gpt-5.6-sol", "GPT-5.6 Sol (US cross-region)", 4),- ("us.openai.gpt-6-astra", "GPT-6-Astra (US cross-region)", 5),+ ("global.openai.gpt-6-luna", "GPT-6 Luna (Global)", 2),+ ("global.openai.gpt-5.6-sol", "GPT-5.6 Sol (Global)", 3),+ ("global.openai.gpt-5.6-terra", "GPT-5.6 Terra (Global)", 4),+ ("global.openai.gpt-5.6-luna", "GPT-5.6 Luna (Global)", 5),+ ("us.openai.gpt-6-sol", "GPT-6 Sol (US cross-region)", 6),+ ("us.openai.gpt-6-astra", "GPT-6-Astra (US cross-region)", 7),+ ("us.openai.gpt-6-luna", "GPT-6 Luna (US cross-region)", 8),+ ("us.openai.gpt-5.6-sol", "GPT-5.6 Sol (US cross-region)", 9),("us.openai.gpt-5.6-terra","GPT-5.6 Terra (US cross-region)",- 6,+ 10),("us.openai.gpt-5.6-luna","GPT-5.6 Luna (US cross-region)",- 7+ 11),]);@@ -55,7 +59,7 @@ fn runtime_catalog_disables_web_search_without_overriding_review_models() {.collect::<Vec<_>>(),vec![(- "global.openai.gpt-5.6-sol",+ "global.openai.gpt-6-sol",None,false,Some(MultiAgentVersion::V1),@@ -66,6 +70,18 @@ fn runtime_catalog_disables_web_search_without_overriding_review_models() {false,Some(MultiAgentVersion::V1),),+ (+ "global.openai.gpt-6-luna",+ None,+ false,+ Some(MultiAgentVersion::V1),+ ),+ (+ "global.openai.gpt-5.6-sol",+ None,+ false,+ Some(MultiAgentVersion::V1),+ ),("global.openai.gpt-5.6-terra",None,@@ -79,7 +95,7 @@ fn runtime_catalog_disables_web_search_without_overriding_review_models() {Some(MultiAgentVersion::V1),),(- "us.openai.gpt-5.6-sol",+ "us.openai.gpt-6-sol",None,false,Some(MultiAgentVersion::V1),@@ -90,6 +106,18 @@ fn runtime_catalog_disables_web_search_without_overriding_review_models() {false,Some(MultiAgentVersion::V1),),+ (+ "us.openai.gpt-6-luna",+ None,+ false,+ Some(MultiAgentVersion::V1),+ ),+ (+ "us.openai.gpt-5.6-sol",+ None,+ false,+ Some(MultiAgentVersion::V1),+ ),("us.openai.gpt-5.6-terra",None,diff --git a/codex-rs/model-provider/src/provider.rs b/codex-rs/model-provider/src/provider.rsindex 08afa3e56f..07b34c39e4 100644--- a/codex-rs/model-provider/src/provider.rs+++ b/codex-rs/model-provider/src/provider.rs@@ -1263,7 +1263,12 @@ printf '%s\n' '{"AccessKeyId":"exported","SecretAccessKey":"secret"}').await;assert_eq!(uncached_catalog, catalog);- for slug in ["openai.gpt-5.6-sol", "openai.gpt-6-astra"] {+ for slug in [+ "openai.gpt-6-sol",+ "openai.gpt-6-luna",+ "openai.gpt-5.6-sol",+ "openai.gpt-6-astra",+ ] {let model_info = manager.get_model_info(slug,@@ -1289,8 +1294,10 @@ printf '%s\n' '{"AccessKeyId":"exported","SecretAccessKey":"secret"}'assert_eq!(models,vec![- ("openai.gpt-5.6-sol", "GPT-5.6 Sol"),+ ("openai.gpt-6-sol", "GPT-6 Sol"),("openai.gpt-6-astra", "GPT-6-Astra"),+ ("openai.gpt-6-luna", "GPT-6 Luna"),+ ("openai.gpt-5.6-sol", "GPT-5.6 Sol"),("openai.gpt-5.6-terra", "GPT-5.6 Terra"),("openai.gpt-5.6-luna", "GPT-5.6 Luna"),("openai.gpt-5.5", "GPT-5.5"),@@ -1310,8 +1317,10 @@ printf '%s\n' '{"AccessKeyId":"exported","SecretAccessKey":"secret"}'.map(|preset| preset.model.as_str()).collect::<Vec<_>>(),vec![- "openai.gpt-5.6-sol",+ "openai.gpt-6-sol","openai.gpt-6-astra",+ "openai.gpt-6-luna",+ "openai.gpt-5.6-sol","openai.gpt-5.6-terra","openai.gpt-5.6-luna","openai.gpt-5.5",@@ -1324,7 +1333,7 @@ printf '%s\n' '{"AccessKeyId":"exported","SecretAccessKey":"secret"}'.find(|preset| preset.is_default).expect("Bedrock catalog should have a default model");- assert_eq!(default_model.model, "openai.gpt-5.6-sol");+ assert_eq!(default_model.model, "openai.gpt-6-sol");}#[tokio::test]diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__bedrock_mantle_models.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__bedrock_mantle_models.snapindex b97071a69c..139fc6707d 100644--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__bedrock_mantle_models.snap+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__bedrock_mantle_models.snap@@ -5,11 +5,13 @@ expression: "render_bottom_popup(&chat, 100)"Select Model and Effort-› 1. GPT-5.6 Sol (current) Older coding model for complex work.- 2. GPT-6-Astra Frontier intelligence for the most demanding work.- 3. GPT-5.6 Terra Older balanced model for straightforward work.- 4. GPT-5.6 Luna Older fast and efficient model.- 5. GPT-5.5 Legacy coding model.- 6. GPT-5.4 Strong model for everyday coding.+› 1. GPT-6 Sol (current) Workhorse model for coding and everyday work.+ 2. GPT-6-Astra Frontier intelligence for the most demanding work.+ 3. GPT-6 Luna Fast and affordable model for easier tasks.+ 4. GPT-5.6 Sol Older coding model for complex work.+ 5. GPT-5.6 Terra Older balanced model for straightforward work.+ 6. GPT-5.6 Luna Older fast and efficient model.+ 7. GPT-5.5 Legacy coding model.+ 8. GPT-5.4 Strong model for everyday coding.enter select · esc backdiff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__bedrock_runtime_models.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__bedrock_runtime_models.snapindex fd13dc0c9a..52989b3c7f 100644--- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__bedrock_runtime_models.snap+++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__bedrock_runtime_models.snap@@ -5,13 +5,13 @@ expression: "render_bottom_popup(&chat, 100)"Select Model and Effort-› 1. GPT-5.6 Sol (Global) (current) Older coding model for complex work.- 2. GPT-6-Astra (Global) Frontier intelligence for the most demanding work.- 3. GPT-5.6 Terra (Global) Older balanced model for straightforward work.- 4. GPT-5.6 Luna (Global) Older fast and efficient model.- 5. GPT-5.6 Sol (US cross-region) Older coding model for complex work.- 6. GPT-6-Astra (US cross-region) Frontier intelligence for the most demanding work.- 7. GPT-5.6 Terra (US cross-region) Older balanced model for straightforward work.- 8. GPT-5.6 Luna (US cross-region) Older fast and efficient model.-+› 1. GPT-6 Sol (Global) (current) Workhorse model for coding and everyday work.+ 2. GPT-6-Astra (Global) Frontier intelligence for the most demanding work.+ 3. GPT-6 Luna (Global) Fast and affordable model for easier tasks.+ 4. GPT-5.6 Sol (Global) Older coding model for complex work.+ 5. GPT-5.6 Terra (Global) Older balanced model for straightforward work.+ 6. GPT-5.6 Luna (Global) Older fast and efficient model.+ 7. GPT-6 Sol (US cross-region) Workhorse model for coding and everyday work.+ 8. GPT-6-Astra (US cross-region) Frontier intelligence for the most demanding work.+↓enter select · esc backdiff --git a/codex-rs/tui/src/chatwidget/tests/bedrock_catalog_tests.rs b/codex-rs/tui/src/chatwidget/tests/bedrock_catalog_tests.rsindex 698f42e891..5bcf9261b8 100644--- a/codex-rs/tui/src/chatwidget/tests/bedrock_catalog_tests.rs+++ b/codex-rs/tui/src/chatwidget/tests/bedrock_catalog_tests.rs@@ -13,13 +13,13 @@ async fn bedrock_astra_model_and_reasoning_pickers() {("mantle",ModelProviderInfo::create_amazon_bedrock_provider(/*aws*/ None),- "openai.gpt-5.6-sol",+ "openai.gpt-6-sol","openai.gpt-6-astra",),("runtime",ModelProviderInfo::create_amazon_bedrock_runtime_provider(/*aws*/ None),- "global.openai.gpt-5.6-sol",+ "global.openai.gpt-6-sol","global.openai.gpt-6-astra",),] {