Use Claude Code with your ChatGPT, Kimi, Cursor or Grok subscription via a local Anthropic-compatible proxy
Rust
feat(codex): add gpt-6-sol and gpt-6-luna, route opus/haiku to them (#165)
Richard Tuin83eb2ae1c5d1
diff --git a/README.md b/README.mdindex c9e6f0b..c8993e0 100644--- a/README.md+++ b/README.md@@ -63,8 +63,8 @@ Start Claude Code in another:```shANTHROPIC_BASE_URL=http://127.0.0.1:18765 \ANTHROPIC_AUTH_TOKEN=unused \-ANTHROPIC_MODEL=gpt-5.6-sol[1m] \-ANTHROPIC_SMALL_FAST_MODEL=gpt-5.6-luna[1m] \+ANTHROPIC_MODEL=gpt-6-sol[1m] \+ANTHROPIC_SMALL_FAST_MODEL=gpt-6-luna[1m] \CLAUDE_CODE_AUTO_COMPACT_WINDOW=272000 \CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1 \CLAUDE_CODE_DISABLE_NONSTREAMING_FALLBACK=1 \diff --git a/docs/src/content/docs/getting-started.md b/docs/src/content/docs/getting-started.mdindex f6943a5..f9c0670 100644--- a/docs/src/content/docs/getting-started.md+++ b/docs/src/content/docs/getting-started.md@@ -48,8 +48,8 @@ Open another terminal and run:```shANTHROPIC_BASE_URL=http://127.0.0.1:18765 \ANTHROPIC_AUTH_TOKEN=unused \-ANTHROPIC_MODEL=gpt-5.6-sol[1m] \-ANTHROPIC_SMALL_FAST_MODEL=gpt-5.6-luna[1m] \+ANTHROPIC_MODEL=gpt-6-sol[1m] \+ANTHROPIC_SMALL_FAST_MODEL=gpt-6-luna[1m] \CLAUDE_CODE_AUTO_COMPACT_WINDOW=272000 \CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1 \CLAUDE_CODE_DISABLE_NONSTREAMING_FALLBACK=1 \diff --git a/docs/src/content/docs/providers/codex.md b/docs/src/content/docs/providers/codex.mdindex 1a4795a..e43f8ce 100644--- a/docs/src/content/docs/providers/codex.md+++ b/docs/src/content/docs/providers/codex.md@@ -28,7 +28,9 @@ The proxy owns its tokens and does not read native Codex CLI credentials. It refUse `claude-code-proxy models` as the current catalog. Model access depends on your ChatGPT account. A model rejected by the subscription produces the upstream error verbatim.-Append `-fast` to any registered Codex model to request `service_tier: "priority"`. For example, `gpt-5.6-sol-fast` selects `gpt-5.6-sol` with fast service. `CCP_CODEX_SERVICE_TIER` or `codex.serviceTier` takes precedence.+Claude-style aliases map to Codex models: `haiku` and `claude-haiku-*` to `gpt-6-luna`, `sonnet` and `claude-sonnet-*` to `gpt-5.6-terra`, and `opus`, `fable`, `claude-opus-*` (including `claude-opus-5-5`), and `claude-fable-*` to `gpt-6-sol`.++Append `-fast` to any registered Codex model to request `service_tier: "priority"`. For example, `gpt-6-sol-fast` selects `gpt-6-sol` with fast service. `CCP_CODEX_SERVICE_TIER` or `codex.serviceTier` takes precedence.## Reasoningdiff --git a/docs/src/content/docs/reference/configuration.md b/docs/src/content/docs/reference/configuration.mdindex 9648e75..28a2ec4 100644--- a/docs/src/content/docs/reference/configuration.md+++ b/docs/src/content/docs/reference/configuration.md@@ -18,7 +18,7 @@ These settings configure the proxy process. Claude Code client settings such as"codex": {"originator": "claude-code-proxy","userAgent": "claude-code-proxy/0.1.24",- "model": "gpt-5.6-sol",+ "model": "gpt-6-sol","effort": "high","reasoningSummary": "auto","serviceTier": "fast",@@ -66,7 +66,7 @@ All keys are optional. An unreadable file, malformed JSON, or incompatible field| `PORT` | `port` | `18765` | Listener port. || `CCP_CONFIG_DIR` | none | Platform config directory | Replaces the configuration and file-backed auth root. || `CCP_ALIAS_PROVIDER` | `aliasProvider` | `codex` | Routes recognized Anthropic-style aliases through `codex` or `kimi`. |-| `CCP_AUTO_REVIEW_MODEL` | `autoReviewModel` | `gpt-5.6-luna` for Codex | Routes Claude Code's non-streaming, tool-free Bash security-review classifier through a registered model. |+| `CCP_AUTO_REVIEW_MODEL` | `autoReviewModel` | `gpt-6-luna` for Codex | Routes Claude Code's non-streaming, tool-free Bash security-review classifier through a registered model. || `CCP_LOG_STDERR` | `log.stderr` | `false` | Mirrors logs to stderr when present in the environment, regardless of its value. || `CCP_LOG_VERBOSE` | `log.verbose` | `false` | Preserves full string fields in structured logs when present, regardless of its value. || `CCP_TRAFFIC_LOG` | none | `false` | Enables full request captures for `1`, `true`, or `yes`. |@@ -74,7 +74,7 @@ All keys are optional. An unreadable file, malformed JSON, or incompatible field`CCP_CONFIG_DIR` affects `config.json` and file-backed provider auth. It does not relocate the state directory.-Codex auto-review classifier requests use `gpt-5.6-luna` by default. Requests routed through other providers retain their requested model. `CCP_AUTO_REVIEW_MODEL` or `autoReviewModel` selects an explicit registered model for all detected classifier requests without changing the session's provider affinity. Normal messages, streaming requests, tool-using requests, and token counting retain their requested model.+Codex auto-review classifier requests use `gpt-6-luna` by default. Requests routed through other providers retain their requested model. `CCP_AUTO_REVIEW_MODEL` or `autoReviewModel` selects an explicit registered model for all detected classifier requests without changing the session's provider affinity. Normal messages, streaming requests, tool-using requests, and token counting retain their requested model.## Outbound proxiesdiff --git a/docs/src/content/docs/reference/http-api.md b/docs/src/content/docs/reference/http-api.mdindex 5e1257c..65004fd 100644--- a/docs/src/content/docs/reference/http-api.md+++ b/docs/src/content/docs/reference/http-api.md@@ -56,12 +56,12 @@ Returns Anthropic-shaped model discovery:"data": [{"type": "model",- "id": "gpt-5.6-sol",- "display_name": "gpt-5.6-sol (codex)"+ "id": "gpt-6-sol",+ "display_name": "gpt-6-sol (codex)"}],"has_more": false,- "first_id": "gpt-5.6-sol",+ "first_id": "gpt-6-sol","last_id": "cursor:gpt-5.5"}```diff --git a/docs/src/content/docs/using/configure-claude-code.md b/docs/src/content/docs/using/configure-claude-code.mdindex c3a0d23..031d392 100644--- a/docs/src/content/docs/using/configure-claude-code.md+++ b/docs/src/content/docs/using/configure-claude-code.md@@ -10,8 +10,8 @@ Claude Code reads its API connection when the process starts. These variables be```shANTHROPIC_BASE_URL=http://127.0.0.1:18765 \ANTHROPIC_AUTH_TOKEN=unused \-ANTHROPIC_MODEL=gpt-5.6-sol[1m] \-ANTHROPIC_SMALL_FAST_MODEL=gpt-5.6-luna[1m] \+ANTHROPIC_MODEL=gpt-6-sol[1m] \+ANTHROPIC_SMALL_FAST_MODEL=gpt-6-luna[1m] \CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1 \CLAUDE_CODE_DISABLE_NONSTREAMING_FALLBACK=1 \claude@@ -50,8 +50,8 @@ If every Claude Code session should use the proxy, put client variables in `~/.c"env": {"ANTHROPIC_BASE_URL": "http://127.0.0.1:18765","ANTHROPIC_AUTH_TOKEN": "unused",- "ANTHROPIC_MODEL": "gpt-5.6-sol[1m]",- "ANTHROPIC_SMALL_FAST_MODEL": "gpt-5.6-luna[1m]",+ "ANTHROPIC_MODEL": "gpt-6-sol[1m]",+ "ANTHROPIC_SMALL_FAST_MODEL": "gpt-6-luna[1m]","CLAUDE_CODE_AUTO_COMPACT_WINDOW": 272000,"CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC": 1,"CLAUDE_CODE_DISABLE_NONSTREAMING_FALLBACK": 1diff --git a/docs/src/content/docs/using/models-and-routing.md b/docs/src/content/docs/using/models-and-routing.mdindex 2541925..77c4ce6 100644--- a/docs/src/content/docs/using/models-and-routing.md+++ b/docs/src/content/docs/using/models-and-routing.md@@ -48,8 +48,8 @@ A trailing `[1m]` affects Claude Code's local compaction policy. The proxy stripSet both model variables to routable IDs:```sh-ANTHROPIC_MODEL=gpt-5.6-sol[1m]-ANTHROPIC_SMALL_FAST_MODEL=gpt-5.6-luna[1m]+ANTHROPIC_MODEL=gpt-6-sol[1m]+ANTHROPIC_SMALL_FAST_MODEL=gpt-6-luna[1m]```Claude Code sends background work to its small/fast model. Its built-in Haiku ID can route through `aliasProvider`, but a concrete provider ID keeps the behavior explicit.@@ -72,8 +72,8 @@ Enable Claude Code discovery at process start:CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY=1 \ANTHROPIC_BASE_URL=http://127.0.0.1:18765 \ANTHROPIC_AUTH_TOKEN=unused \-ANTHROPIC_MODEL=gpt-5.6-sol[1m] \-ANTHROPIC_SMALL_FAST_MODEL=gpt-5.6-luna[1m] \+ANTHROPIC_MODEL=gpt-6-sol[1m] \+ANTHROPIC_SMALL_FAST_MODEL=gpt-6-luna[1m] \claude```diff --git a/docs/src/content/docs/using/switching-models-and-backends.md b/docs/src/content/docs/using/switching-models-and-backends.mdindex 8390181..f7f8bda 100644--- a/docs/src/content/docs/using/switching-models-and-backends.md+++ b/docs/src/content/docs/using/switching-models-and-backends.md@@ -15,7 +15,7 @@ Claude Code binds its base URL and client auth when the process starts. A **back## One-shot aliases```sh-alias csol='ANTHROPIC_BASE_URL=http://127.0.0.1:18765 ANTHROPIC_AUTH_TOKEN=unused ANTHROPIC_MODEL=gpt-5.6-sol[1m] ANTHROPIC_SMALL_FAST_MODEL=gpt-5.6-luna[1m] CLAUDE_CODE_AUTO_COMPACT_WINDOW=272000 CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1 CLAUDE_CODE_DISABLE_NONSTREAMING_FALLBACK=1 claude'+alias csol='ANTHROPIC_BASE_URL=http://127.0.0.1:18765 ANTHROPIC_AUTH_TOKEN=unused ANTHROPIC_MODEL=gpt-6-sol[1m] ANTHROPIC_SMALL_FAST_MODEL=gpt-6-luna[1m] CLAUDE_CODE_AUTO_COMPACT_WINDOW=272000 CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1 CLAUDE_CODE_DISABLE_NONSTREAMING_FALLBACK=1 claude'alias cgrok='ANTHROPIC_BASE_URL=http://127.0.0.1:18765 ANTHROPIC_AUTH_TOKEN=unused ANTHROPIC_MODEL=grok-4.5 ANTHROPIC_SMALL_FAST_MODEL=grok-4.5 CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1 CLAUDE_CODE_DISABLE_NONSTREAMING_FALLBACK=1 claude'```@@ -35,7 +35,7 @@ flag="$HOME/.claude/claude-code-proxy-enabled"model_file="$HOME/.claude/claude-code-proxy-model"if [ -f "$flag" ]; then- model="gpt-5.6-sol[1m]"+ model="gpt-6-sol[1m]"[ ! -f "$model_file" ] || model="$(tr -d '[:space:]' <"$model_file")"export ANTHROPIC_BASE_URL="http://127.0.0.1:18765"@@ -66,7 +66,7 @@ New processes read the flag and model. Running processes retain their launch envWith the base URL already pointing to the proxy:```text-/model gpt-5.6-sol-fast[1m]+/model gpt-6-sol-fast[1m]/model kimi-for-coding[1m]/model grok-4.5/model cursor:gpt-5.5diff --git a/src/main.rs b/src/main.rsindex 297d9c5..1899dbb 100644--- a/src/main.rs+++ b/src/main.rs@@ -382,8 +382,8 @@ fn print_server_banner(bind_address: &str, port: u16, registry: &Registry) {println!("Configure Claude Code (pick a model from above):");println!(" export ANTHROPIC_BASE_URL=\"http://localhost:{port}\"");println!(" export ANTHROPIC_AUTH_TOKEN=\"anything\"");- println!(" export ANTHROPIC_MODEL=\"gpt-5.6-sol\"");- println!(" export ANTHROPIC_SMALL_FAST_MODEL=\"gpt-5.6-luna\"");+ println!(" export ANTHROPIC_MODEL=\"gpt-6-sol\"");+ println!(" export ANTHROPIC_SMALL_FAST_MODEL=\"gpt-6-luna\"");println!(" export CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1");}diff --git a/src/providers/codex/mod.rs b/src/providers/codex/mod.rsindex 1b2e3f6..9703fdc 100644--- a/src/providers/codex/mod.rs+++ b/src/providers/codex/mod.rs@@ -99,7 +99,7 @@ impl CodexProvider {) -> Response {let message_id = format!("msg_{}", uuid::Uuid::new_v4().to_string().replace('-', ""));let want_stream = body.stream;- let model = body.model.as_deref().unwrap_or("gpt-5.6-sol");+ let model = body.model.as_deref().unwrap_or("gpt-6-sol");let mut resolved =resolve_model_request_with_config_override(model, !body.bypass_provider_model_override);@@ -558,7 +558,7 @@ impl Provider for CodexProvider {}async fn handle_count_tokens(&self, body: MessagesRequest, ctx: RequestContext) -> Response {- let model = body.model.as_deref().unwrap_or("gpt-5.6-sol");+ let model = body.model.as_deref().unwrap_or("gpt-6-sol");let mut resolved =resolve_model_request_with_config_override(model, !body.bypass_provider_model_override);if let Err(e) = assert_allowed_model(&resolved.model) {@@ -1874,6 +1874,8 @@ mod tests {("gpt-5.6-luna", "gpt-5.6-sol"),("gpt-5.6-sol", "gpt-5.6-sol"),("gpt-5.6-terra", "gpt-5.6-terra"),+ ("gpt-6-luna", "gpt-6-sol"),+ ("gpt-6-sol", "gpt-6-sol"),("gpt-5.4", "gpt-5.4"),] {let mut model = resolved.to_string();@@ -1891,6 +1893,8 @@ mod tests {for (resolved, lite_expected) in [("gpt-5.6-luna", true),("gpt-5.6-sol", true),+ ("gpt-6-luna", true),+ ("gpt-6-sol", true),("gpt-5.4", false),] {let mut model = resolved.to_string();@@ -2066,6 +2070,9 @@ mod tests {assert!(models.contains(&"gpt-5.6-sol-fast".to_string()));assert!(models.contains(&"gpt-5.6-terra".to_string()));assert!(models.contains(&"gpt-5.6-luna".to_string()));+ assert!(models.contains(&"gpt-6-sol".to_string()));+ assert!(models.contains(&"gpt-6-sol-fast".to_string()));+ assert!(models.contains(&"gpt-6-luna".to_string()));assert!(models.contains(&"gpt-5.4".to_string()));assert!(models.contains(&"gpt-5.4-mini".to_string()));}diff --git a/src/providers/codex/native.rs b/src/providers/codex/native.rsindex 63995b9..23fb6c4 100644--- a/src/providers/codex/native.rs+++ b/src/providers/codex/native.rs@@ -693,8 +693,8 @@ mod tests {fn native_request_resolves_alias_and_fast_tier() {let mut body = request(json!({"model":"claude-opus-5","input":[]}));let resolved = shape_native_request(&mut body).unwrap();- assert_eq!(resolved.model, "gpt-5.6-sol");- assert_eq!(body["model"], "gpt-5.6-sol");+ assert_eq!(resolved.model, "gpt-6-sol");+ assert_eq!(body["model"], "gpt-6-sol");assert!(resolved.use_responses_lite);let mut fast = request(json!({"model":"gpt-5.4-fast","input":[]}));diff --git a/src/providers/codex/translate/model_allowlist.rs b/src/providers/codex/translate/model_allowlist.rsindex 40729b9..274e07d 100644--- a/src/providers/codex/translate/model_allowlist.rs+++ b/src/providers/codex/translate/model_allowlist.rs@@ -15,21 +15,24 @@ pub const ALLOWED_MODELS: &[&str] = &["gpt-5.6-sol","gpt-5.6-terra","gpt-6-astra",+ "gpt-6-luna",+ "gpt-6-sol",];pub const MODEL_ALIASES: &[(&str, &str)] = &[- ("haiku", "gpt-5.6-luna"),- ("claude-haiku-4-5", "gpt-5.6-luna"),- ("claude-haiku-4-5-20251001", "gpt-5.6-luna"),+ ("haiku", "gpt-6-luna"),+ ("claude-haiku-4-5", "gpt-6-luna"),+ ("claude-haiku-4-5-20251001", "gpt-6-luna"),("sonnet", "gpt-5.6-terra"),("claude-sonnet-4-6", "gpt-5.6-terra"),("claude-sonnet-5", "gpt-5.6-terra"),- ("opus", "gpt-5.6-sol"),- ("claude-opus-4-7", "gpt-5.6-sol"),- ("claude-opus-4-8", "gpt-5.6-sol"),- ("claude-opus-5", "gpt-5.6-sol"),- ("fable", "gpt-5.6-sol"),- ("claude-fable-5", "gpt-5.6-sol"),+ ("opus", "gpt-6-sol"),+ ("claude-opus-4-7", "gpt-6-sol"),+ ("claude-opus-4-8", "gpt-6-sol"),+ ("claude-opus-5", "gpt-6-sol"),+ ("claude-opus-5-5", "gpt-6-sol"),+ ("fable", "gpt-6-sol"),+ ("claude-fable-5", "gpt-6-sol"),];#[derive(Debug, Clone)]@@ -120,19 +123,24 @@ pub fn assert_allowed_model(model: &str) -> Result<(), ModelNotAllowedError> {pub fn uses_responses_lite(model: &str) -> bool {matches!(model,- "gpt-5.6-luna" | "gpt-5.6-sol" | "gpt-5.6-terra" | "gpt-6-astra"+ "gpt-5.6-luna"+ | "gpt-5.6-sol"+ | "gpt-5.6-terra"+ | "gpt-6-astra"+ | "gpt-6-luna"+ | "gpt-6-sol")}-/// `gpt-5.6-luna` exists only behind the Responses Lite lane; the full-/// Responses API resolves it to a `-free` variant and returns 404 (Model not+/// Luna models exist only behind the Responses Lite lane; the full+/// Responses API resolves them to a `-free` variant and returns 404 (Model not/// found gpt-5.6-luna-free-...). Hosted web_search requests must run on the/// full lane, so luna is upgraded to its nearest full-lane sibling.pub fn full_lane_web_search_model(model: &str) -> &str {- if model == "gpt-5.6-luna" {- "gpt-5.6-sol"- } else {- model+ match model {+ "gpt-5.6-luna" => "gpt-5.6-sol",+ "gpt-6-luna" => "gpt-6-sol",+ _ => model,}}@@ -154,7 +162,7 @@ mod tests {#[test]fn haiku_resolves_to_luna() {let r = resolve_model_request("haiku");- assert_eq!(r.model, "gpt-5.6-luna");+ assert_eq!(r.model, "gpt-6-luna");}#[test]@@ -163,6 +171,8 @@ mod tests {assert_eq!(full_lane_web_search_model("gpt-5.6-sol"), "gpt-5.6-sol");assert_eq!(full_lane_web_search_model("gpt-5.6-terra"), "gpt-5.6-terra");assert_eq!(full_lane_web_search_model("gpt-5.4"), "gpt-5.4");+ assert_eq!(full_lane_web_search_model("gpt-6-luna"), "gpt-6-sol");+ assert_eq!(full_lane_web_search_model("gpt-6-sol"), "gpt-6-sol");}#[test]@@ -180,14 +190,14 @@ mod tests {#[test]fn opus_resolves_to_sol() {let r = resolve_model_request("opus");- assert_eq!(r.model, "gpt-5.6-sol");+ assert_eq!(r.model, "gpt-6-sol");}#[test]fn opus_aliases_resolve_to_sol() {- for model in ["claude-opus-4-8", "claude-opus-5"] {+ for model in ["claude-opus-4-8", "claude-opus-5", "claude-opus-5-5"] {let r = resolve_model_request(model);- assert_eq!(r.model, "gpt-5.6-sol");+ assert_eq!(r.model, "gpt-6-sol");}}@@ -195,10 +205,23 @@ mod tests {fn fable_5_resolves_to_sol() {for model in ["fable", "claude-fable-5"] {let r = resolve_model_request(model);- assert_eq!(r.model, "gpt-5.6-sol");+ assert_eq!(r.model, "gpt-6-sol");}}+ #[test]+ fn gpt_6_sol_fast_adds_priority() {+ let r = resolve_model_request("gpt-6-sol-fast");+ assert_eq!(r.model, "gpt-6-sol");+ assert_eq!(r.service_tier, Some(ServiceTier::Priority));+ }++ #[test]+ fn gpt_6_models_use_responses_lite() {+ assert!(uses_responses_lite("gpt-6-sol"));+ assert!(uses_responses_lite("gpt-6-luna"));+ }+#[test]fn fast_suffix_adds_priority() {let r = resolve_model_request("gpt-5.6-sol-fast");diff --git a/src/registry.rs b/src/registry.rsindex 506588a..790d3a6 100644--- a/src/registry.rs+++ b/src/registry.rs@@ -20,6 +20,7 @@ pub const ANTHROPIC_STYLE_ALIASES: &[&str] = &["claude-opus-4-7","claude-opus-4-8","claude-opus-5",+ "claude-opus-5-5","fable","claude-fable-5",];@@ -48,6 +49,8 @@ pub(crate) const CODEX_MODELS: &[&str] = &["gpt-5.6-sol","gpt-5.6-terra","gpt-6-astra",+ "gpt-6-luna",+ "gpt-6-sol",];pub(crate) const KIMI_MODELS: &[&str] = &["kimi-for-coding", "kimi-k2.6", "kimi-k3", "k2.6", "k3"];@@ -370,6 +373,7 @@ mod tests {for model in ["claude-sonnet-5","claude-opus-5",+ "claude-opus-5-5","fable","claude-fable-5",] {@@ -417,6 +421,17 @@ mod tests {);}+ #[test]+ fn gpt_6_sol_and_luna_route_to_codex() {+ let registry = Registry::new(AliasProvider::Codex);+ for model in ["gpt-6-sol", "gpt-6-sol-fast", "gpt-6-luna"] {+ assert_eq!(+ registry.provider_for_model(model, None).unwrap().name(),+ "codex"+ );+ }+ }+#[test]fn opencode_models_route_without_stealing_existing_provider_ids() {let registry = Registry::new(AliasProvider::Codex);diff --git a/src/server.rs b/src/server.rsindex 9ef5e3b..da3c842 100644--- a/src/server.rs+++ b/src/server.rs@@ -51,7 +51,7 @@ use uuid::Uuid;const CLAUDE_AUTO_REVIEW_SYSTEM_PREFIX: &str ="You are a security monitor for autonomous AI coding agents.";-const CODEX_AUTO_REVIEW_MODEL: &str = "gpt-5.6-luna";+const CODEX_AUTO_REVIEW_MODEL: &str = "gpt-6-luna";#[derive(Debug, Clone, PartialEq, Eq)]struct AutoReviewRoute {@@ -2335,8 +2335,8 @@ mod auto_review_tests {let route = apply_auto_review_model(&mut classifier, false, None, "codex").expect("classifier should be routed");assert_eq!(route.requested_model, "gpt-5.6-sol");- assert_eq!(route.override_model, "gpt-5.6-luna");- assert_eq!(classifier.model.as_deref(), Some("gpt-5.6-luna"));+ assert_eq!(route.override_model, "gpt-6-luna");+ assert_eq!(classifier.model.as_deref(), Some("gpt-6-luna"));}#[test]diff --git a/src/tui.rs b/src/tui.rsindex 08967a2..994b814 100644--- a/src/tui.rs+++ b/src/tui.rs@@ -1760,8 +1760,8 @@ pub fn setup_text(port: u16, registry: &Registry) -> String {"export ANTHROPIC_BASE_URL=\"http://localhost:{port}\""));lines.push("export ANTHROPIC_AUTH_TOKEN=\"anything\"".to_string());- lines.push("export ANTHROPIC_MODEL=\"gpt-5.6-sol\"".to_string());- lines.push("export ANTHROPIC_SMALL_FAST_MODEL=\"gpt-5.6-luna\"".to_string());+ lines.push("export ANTHROPIC_MODEL=\"gpt-6-sol\"".to_string());+ lines.push("export ANTHROPIC_SMALL_FAST_MODEL=\"gpt-6-luna\"".to_string());lines.push("export CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1".to_string());lines.join("\n")}diff --git a/tests/codex_agent_continuation.rs b/tests/codex_agent_continuation.rsindex 9fccca9..68ab116 100644--- a/tests/codex_agent_continuation.rs+++ b/tests/codex_agent_continuation.rs@@ -1501,7 +1501,7 @@ async fn auto_review_with_agent_headers_is_stateless() {&classifier,&[("developer", review_system), ("user", &review)],);- assert_eq!(classifier.body["model"], "gpt-5.6-luna");+ assert_eq!(classifier.body["model"], "gpt-6-luna");assert_eq!(first.socket_ordinal, 1);assert_eq!(classifier.socket_ordinal, 2);assert_delta_input(&second, &a_response, first.socket_ordinal, &a2);diff --git a/tests/server.rs b/tests/server.rsindex 1aa4235..e4ec9d2 100644--- a/tests/server.rs+++ b/tests/server.rs@@ -203,7 +203,7 @@ impl Provider for IdentityCaptureProvider {}fn supported_models(&self) -> Vec<String> {- vec!["gpt-5.5".to_string(), "gpt-5.6-luna".to_string()]+ vec!["gpt-5.5".to_string(), "gpt-6-luna".to_string()]}fn cli(&self) -> &'static dyn CliHandlers {diff --git a/tests/smoke_cutover.rs b/tests/smoke_cutover.rsindex ae393d4..86aecc8 100644--- a/tests/smoke_cutover.rs+++ b/tests/smoke_cutover.rs@@ -1584,7 +1584,7 @@ async fn smoke_auto_review_uses_codex_default_and_configured_override() {let sent = captured.lock().unwrap();assert_eq!(sent.len(), 3);- assert_eq!(sent[0]["model"], "gpt-5.6-luna");+ assert_eq!(sent[0]["model"], "gpt-6-luna");assert_eq!(sent[1]["model"], "gpt-5.6-terra");assert_eq!(sent[2]["model"], "gpt-5.6-sol");}