diff --git a/internal/registry/models/codex_client_models.json b/internal/registry/models/codex_client_models.json
index 16b367dd4..34ead936a 100644
--- a/internal/registry/models/codex_client_models.json
+++ b/internal/registry/models/codex_client_models.json
@@ -27,8 +27,8 @@
       "node_repl_disabled": false,
       "auto_review_model_override": null,
       "model_specialty": null,
-      "context_window": 372000,
-      "max_context_window": 372000,
+      "context_window": 272000,
+      "max_context_window": 921000,
       "auto_compact_token_limit": null,
       "comp_hash": "3000",
       "default_reasoning_summary": "none",
@@ -152,8 +152,8 @@
       "node_repl_disabled": false,
       "auto_review_model_override": null,
       "model_specialty": null,
-      "context_window": 372000,
-      "max_context_window": 372000,
+      "context_window": 272000,
+      "max_context_window": 921000,
       "auto_compact_token_limit": null,
       "comp_hash": "3000",
       "default_reasoning_summary": "none",
@@ -277,8 +277,8 @@
       "node_repl_disabled": false,
       "auto_review_model_override": null,
       "model_specialty": null,
-      "context_window": 372000,
-      "max_context_window": 372000,
+      "context_window": 272000,
+      "max_context_window": 921000,
       "auto_compact_token_limit": null,
       "comp_hash": "3000",
       "default_reasoning_summary": "none",
@@ -846,8 +846,8 @@
       "node_repl_disabled": false,
       "auto_review_model_override": null,
       "model_specialty": null,
-      "context_window": 372000,
-      "max_context_window": 372000,
+      "context_window": 272000,
+      "max_context_window": 921000,
       "auto_compact_token_limit": null,
       "comp_hash": "3000",
       "default_reasoning_summary": "none",
diff --git a/internal/registry/models/models.json b/internal/registry/models/models.json
index 7c6ba824b..546692c48 100644
--- a/internal/registry/models/models.json
+++ b/internal/registry/models/models.json
@@ -2918,7 +2918,7 @@
       "display_name": "GPT 5.6 Sol",
       "version": "gpt-5.6",
       "description": "Our most capable model yet. GPT-5.6 Sol can tackle complex code changes, dig into research, produce polished documents, and take on your most ambitious work. Sol is highly capable at lower reasoning efforts—try starting lower, then turn it up for harder jobs.",
-      "context_length": 372000,
+      "context_length": 921000,
       "max_completion_tokens": 128000,
       "supported_parameters": [
         "tools"
@@ -2949,7 +2949,7 @@
       "display_name": "GPT 5.6 Terra",
       "version": "gpt-5.6",
       "description": "Balanced agentic coding model for everyday work.",
-      "context_length": 372000,
+      "context_length": 921000,
       "max_completion_tokens": 128000,
       "supported_parameters": [
         "tools"
@@ -2980,7 +2980,7 @@
       "display_name": "GPT 5.6 Luna",
       "version": "gpt-5.6",
       "description": "Fast and affordable agentic coding model.",
-      "context_length": 372000,
+      "context_length": 921000,
       "max_completion_tokens": 128000,
       "supported_parameters": [
         "tools"