diff --git a/crates/manifest/src/model_catalog.rs b/crates/manifest/src/model_catalog.rs
index 685817595..2bca37e22 100644
--- a/crates/manifest/src/model_catalog.rs
+++ b/crates/manifest/src/model_catalog.rs
@@ -569,6 +569,21 @@ mod tests {
         assert!(matches!(err, ResolveError::MalformedRef(_)));
     }
 
+    #[test]
+    fn builtin_codex_catalog_includes_gpt_6_sol_and_luna() {
+        let models = load_builtin_models().unwrap();
+
+        for model_id in ["gpt-6-sol", "gpt-6-luna"] {
+            let model = models
+                .iter()
+                .find(|model| model.provider == "codex-oauth" && model.id == model_id)
+                .unwrap_or_else(|| panic!("missing codex-oauth/{model_id}"));
+            assert_eq!(model.context_window, Some(1_050_000));
+            assert_eq!(model.max_context_window, Some(272_000));
+            assert!(model.capability.is_some());
+        }
+    }
+
     #[test]
     fn load_providers_from_path() {
         let dir = tempfile::tempdir().unwrap();
diff --git a/resources/models/builtin.toml b/resources/models/builtin.toml
index 05e088d39..605ad1114 100644
--- a/resources/models/builtin.toml
+++ b/resources/models/builtin.toml
@@ -33,9 +33,9 @@ context_window = 256000
 # context window on this route, even when public API docs advertise larger
 # model-family windows.
 # Codex currently caps the ChatGPT-backed route at 272k even though the public
-# GPT-6 Astra and GPT-5.6 Sol advertise a 1.05M context window. Keep both values so
-# resolution and compaction use the effective backend limit without losing each
-# underlying model capability.
+# GPT-6 family and GPT-5.6 Sol advertise a 1.05M context window. Keep both values
+# so resolution and compaction use the effective backend limit without losing
+# each underlying model capability.
 [[model]]
 id = "gpt-6-astra"
 provider = "codex-oauth"
@@ -43,6 +43,20 @@ context_window = 1050000
 max_context_window = 272000
 capability = { tool_calling = "parallel", structured_output = "json_schema", reasoning = "effort", vision = true, prompt_caching = { kind = "auto" } }
 
+[[model]]
+id = "gpt-6-sol"
+provider = "codex-oauth"
+context_window = 1050000
+max_context_window = 272000
+capability = { tool_calling = "parallel", structured_output = "json_schema", reasoning = "effort", vision = true, prompt_caching = { kind = "auto" } }
+
+[[model]]
+id = "gpt-6-luna"
+provider = "codex-oauth"
+context_window = 1050000
+max_context_window = 272000
+capability = { tool_calling = "parallel", structured_output = "json_schema", reasoning = "effort", vision = true, prompt_caching = { kind = "auto" } }
+
 [[model]]
 id = "gpt-5.6-sol"
 provider = "codex-oauth"