Skip to content

hotfix: add GPT-6 provider models and defaults #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yohjisakamoto merged 4 commits into from
Oct 7, 2026
Merged

hotfix: add GPT-6 provider models and defaults #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8668640
hotfix: add GPT-6 provider models and defaults
Yohjisakamoto Oct 3, 2026
e4e9cef
fix: update rustls to resolve CI audit advisory
Yohjisakamoto Oct 3, 2026
950151c
style: format GUI model default
Yohjisakamoto Oct 3, 2026
3d3cc5b
Merge remote-tracking branch 'origin/main' into fix/adding-gpt-6-prov…
Yohjisakamoto Oct 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agents/src/balanced/agent_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"op_manual": true,
"self_reflection": false,
"provider": {
"current_model": "codex/gpt-5.6-sol",
"current_model": "codex/gpt-6-sol",
"default_model_tier": "thinking",
"max_tokens": 0,
"model_acceleration_enabled": true,
Expand Down
2 changes: 1 addition & 1 deletion agents/src/direct-text-only/agent_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"op_manual": true,
"self_reflection": false,
"provider": {
"current_model": "codex/gpt-5.6-sol",
"current_model": "codex/gpt-6-sol",
"default_model_tier": "thinking",
"max_tokens": 0,
"model_acceleration_enabled": true,
Expand Down
2 changes: 1 addition & 1 deletion agents/src/direct/agent_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"op_manual": true,
"self_reflection": false,
"provider": {
"current_model": "codex/gpt-5.6-sol",
"current_model": "codex/gpt-6-sol",
"default_model_tier": "thinking",
"max_tokens": 0,
"model_acceleration_enabled": true,
Expand Down
2 changes: 1 addition & 1 deletion apps/gui/app/src/config/defaults.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export const DEFAULT_MODEL_ID = "openai/gpt-5.6-sol";
export const DEFAULT_MODEL_ID = "openai/gpt-6-sol";
export const DEFAULT_AGENT_ID = "balanced";

export const DEFAULT_MAIN_FONT =
Expand Down
8 changes: 3 additions & 5 deletions apps/gui/app/src/utils/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ export type ProviderAuthDisplayState = {

export function defaultModel(providers: AppState["providers"]): string | undefined {
if (!providers) {
return "openai/gpt-5.6-sol";
return "openai/gpt-6-sol";
}
if (
providers.all.some((provider) => provider.id === "openai" && provider.models["gpt-5.6-sol"])
) {
return "openai/gpt-5.6-sol";
if (providers.all.some((provider) => provider.id === "openai" && provider.models["gpt-6-sol"])) {
return "openai/gpt-6-sol";
}
const firstConnected = providers.connected[0];
if (firstConnected && providers.default[firstConnected]) {
Expand Down
3 changes: 3 additions & 0 deletions crates/gateway/src/api/provider/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,9 @@ fn catalog_provider_model_catalog_filters_hidden_claude_models() {
#[test]
fn catalog_model_supported_by_provider_matches_registry_exactly() {
assert!(model_supported_by_provider("codex", "gpt-5.6-sol"));
assert!(model_supported_by_provider("codex", "gpt-6-sol"));
assert!(model_supported_by_provider("codex", "gpt-6-luna"));
assert!(model_supported_by_provider("codex", "gpt-6-astra"));
assert!(!model_supported_by_provider("codex", "missing-model"));
assert!(!model_supported_by_provider(
"missing-provider",
Expand Down
4 changes: 2 additions & 2 deletions crates/gateway/src/session/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ use std::path::{Path, PathBuf};
const TURA_DIR: &str = ".tura";
const CONFIG_FILE: &str = "config.conf";

pub const DEFAULT_SESSION_MODEL: &str = "codex/gpt-5.6-sol";
pub const DEFAULT_SESSION_MODEL: &str = "codex/gpt-6-sol";
pub const DEFAULT_SESSION_PROVIDER: &str = "codex";
pub const DEFAULT_SESSION_MODEL_ID: &str = "gpt-5.6-sol";
pub const DEFAULT_SESSION_MODEL_ID: &str = "gpt-6-sol";
pub const DEFAULT_SESSION_AGENT: &str = "balanced";
pub const DEFAULT_SESSION_PERSONA: &str = "tura";
pub const DEFAULT_SESSION_TYPE: &str = "coding";
Expand Down
154 changes: 154 additions & 0 deletions crates/provider/config/provider_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,6 +990,32 @@
}
],
"fast": [
{
"attachment": true,
"family": "gpt-6",
"id": "gpt-6-luna",
"limit": {
"context": 1050000,
"input": 922000,
"output": 128000
},
"modalities": {
"input": [
"text",
"image"
],
"output": [
"text"
]
},
"name": "gpt-6-luna",
"options": {},
"reasoning": true,
"release_date": "2026-09-22",
"status": null,
"temperature": false,
"tool_call": true
},
{
"attachment": true,
"family": "gpt-5.6",
Expand Down Expand Up @@ -1098,6 +1124,58 @@
}
],
"thinking": [
{
"attachment": true,
"family": "gpt-6",
"id": "gpt-6-sol",
"limit": {
"context": 1050000,
"input": 922000,
"output": 128000
},
"modalities": {
"input": [
"text",
"image"
],
"output": [
"text"
]
},
"name": "gpt-6-sol",
"options": {},
"reasoning": true,
"release_date": "2026-09-22",
"status": null,
"temperature": false,
"tool_call": true
},
{
"attachment": true,
"family": "gpt-6",
"id": "gpt-6-astra",
"limit": {
"context": 1050000,
"input": 922000,
"output": 128000
},
"modalities": {
"input": [
"text",
"image"
],
"output": [
"text"
]
},
"name": "gpt-6-astra",
"options": {},
"reasoning": true,
"release_date": "2026-09-04",
"status": null,
"temperature": false,
"tool_call": true
},
{
"attachment": true,
"family": "gpt-5.6",
Expand Down Expand Up @@ -2556,6 +2634,32 @@
}
],
"fast": [
{
"attachment": true,
"family": "gpt-6",
"id": "gpt-6-luna",
"limit": {
"context": 1050000,
"input": 922000,
"output": 128000
},
"modalities": {
"input": [
"text",
"image"
],
"output": [
"text"
]
},
"name": "gpt-6-luna",
"options": {},
"reasoning": true,
"release_date": "2026-09-22",
"status": null,
"temperature": false,
"tool_call": true
},
{
"attachment": true,
"family": "gpt-5.6",
Expand Down Expand Up @@ -2636,6 +2740,32 @@
}
],
"thinking": [
{
"attachment": true,
"family": "gpt-6",
"id": "gpt-6-sol",
"limit": {
"context": 1050000,
"input": 922000,
"output": 128000
},
"modalities": {
"input": [
"text",
"image"
],
"output": [
"text"
]
},
"name": "gpt-6-sol",
"options": {},
"reasoning": true,
"release_date": "2026-09-22",
"status": null,
"temperature": false,
"tool_call": true
},
{
"attachment": true,
"family": "gpt-5.6",
Expand Down Expand Up @@ -4602,6 +4732,14 @@
"fast": {
"default_temperature": 0.2,
"providers": [
{
"model": "gpt-6-luna",
"provider": "codex"
},
{
"model": "gpt-6-luna",
"provider": "openai"
},
{
"model": "gpt-5.6-luna",
"provider": "codex"
Expand Down Expand Up @@ -4643,6 +4781,22 @@
"thinking": {
"default_temperature": 0.2,
"providers": [
{
"model": "gpt-6-sol",
"provider": "codex"
},
{
"model": "gpt-6-astra",
"provider": "codex"
},
{
"model": "gpt-6-sol",
"provider": "openai"
},
{
"model": "gpt-6-astra",
"provider": "openai"
},
{
"model": "gpt-5.6-sol",
"provider": "codex"
Expand Down
13 changes: 10 additions & 3 deletions crates/provider/src/auth_registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ const GITHUB_COPILOT_METHODS: &[AuthMethodDescriptor] = &[AuthMethodDescriptor::
)];

const OPENAI_MODELS: &[&str] = &[
"gpt-6-sol",
"gpt-6-astra",
"gpt-6-luna",
"gpt-5.6-sol",
"gpt-5.6-terra",
"gpt-5.6-luna",
Expand All @@ -157,8 +160,10 @@ const OPENAI_MODELS: &[&str] = &[
"text-embedding-3-small",
];
const OPENAI_API_MODELS: &[&str] = &[
"gpt-5.6-sol",
"gpt-6-sol",
"gpt-6-astra",
"gpt-6-luna",
"gpt-5.6-sol",
"gpt-5.6-terra",
"gpt-5.6-luna",
"gpt-5.5-pro",
Expand Down Expand Up @@ -782,12 +787,14 @@ mod tests {
}

#[test]
fn openai_api_registry_exposes_astra_without_changing_the_sol_default() {
fn openai_registry_prioritizes_gpt_6_and_keeps_gpt_5_6() {
let entry = provider_auth_registry_entry("openai").expect("openai registry entry");
let azure = provider_auth_registry_entry("azure").expect("azure registry entry");

assert_eq!(entry.supported_models.first(), Some(&"gpt-5.6-sol"));
assert_eq!(entry.supported_models.first(), Some(&"gpt-6-sol"));
assert!(entry.supported_models.contains(&"gpt-6-astra"));
assert!(entry.supported_models.contains(&"gpt-6-luna"));
assert!(entry.supported_models.contains(&"gpt-5.6-sol"));
assert!(!azure.supported_models.contains(&"gpt-6-astra"));
}

Expand Down
4 changes: 3 additions & 1 deletion crates/provider/src/llm/openapi/chat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,10 @@ pub(crate) fn build_chat_payload(
let mut payload = json!({
"model": request_model,
"messages": normalized_messages,
"temperature": options.temperature.unwrap_or(0.2),
});
if !matches!(model, "gpt-6-sol" | "gpt-6-astra" | "gpt-6-luna") {
payload["temperature"] = json!(options.temperature.unwrap_or(0.2));
}

if let Some(tools) = &options.tools {
payload["tools"] = Value::Array(tools.clone());
Expand Down
7 changes: 6 additions & 1 deletion crates/provider/src/llm/openapi/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,12 @@ fn model_supports_max_reasoning(model: &str) -> bool {
.to_ascii_lowercase();
matches!(
model.as_str(),
"gpt-6-astra" | "gpt-5.6-sol" | "gpt-5.6-terra" | "gpt-5.6-luna"
"gpt-6-sol"
| "gpt-6-astra"
| "gpt-6-luna"
| "gpt-5.6-sol"
| "gpt-5.6-terra"
| "gpt-5.6-luna"
)
}

Expand Down
14 changes: 12 additions & 2 deletions crates/provider/src/llm/openapi/mod_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,19 +207,29 @@ fn provider_payload_maps_highest_reasoning_to_xhigh() {
}

#[test]
fn provider_payload_keeps_max_reasoning_for_gpt_5_6_family() {
fn provider_payload_keeps_max_reasoning_for_gpt_6_and_5_6_families() {
let messages = vec![json!({"role": "user", "content": "ping"})];
let options = CallOptions {
reasoning_effort: Some("max".to_string()),
..CallOptions::default()
};

for model in ["gpt-5.6-sol", "gpt-5.6-terra", "gpt-5.6-luna"] {
for model in [
"gpt-6-sol",
"gpt-6-astra",
"gpt-6-luna",
"gpt-5.6-sol",
"gpt-5.6-terra",
"gpt-5.6-luna",
] {
let chat_payload = build_chat_payload("openai", model, &messages, &options);
let codex_payload = build_codex_oauth_payload(model, &messages, &options);

assert_eq!(chat_payload["reasoning_effort"], "max", "chat {model}");
assert_eq!(codex_payload["reasoning"]["effort"], "max", "codex {model}");
if model.starts_with("gpt-6-") {
assert!(chat_payload.get("temperature").is_none(), "chat {model}");
}
}
}

Expand Down
Loading
Loading