Skip to content

fix(codex): avoid creating an empty default provider #527

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

Open
Charlie-1909 wants to merge 3 commits into
base: main
Choose a base branch
from
+371 −153
Open

fix(codex): avoid creating an empty default provider #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed6a28b
fix(codex): avoid creating an empty default provider
Charlie-1909 Aug 20, 2026
c185df0
test(codex): cover providerless config persistence
Charlie-1909 Aug 20, 2026
17d3ebf
fix(codex): skip provider writes without an API URL
Charlie-1909 Aug 20, 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
277 changes: 192 additions & 85 deletions src-tauri/src/commands/acp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2630,6 +2630,31 @@ fn ensure_codex_provider_auth_default(provider_table: &mut toml::map::Map<String
);
}

/// Resolve which Codex provider a write should target, without treating
/// codeg's `codeg` display fallback as a real selection (issue #520).
///
/// Uses the root `model_provider` already selected in `config.toml` when
/// present; otherwise only claims `codeg` when a non-empty API base URL
/// requires codeg's managed provider. Returns `None` when no provider
/// should be created or touched at all.
fn codex_provider_name_for_write(
table: &toml::map::Map<String, toml::Value>,
api_base_url: Option<&str>,
) -> Option<String> {
table
.get("model_provider")
.and_then(toml::Value::as_str)
.map(str::trim)
.filter(|value| !value.is_empty())
.map(str::to_string)
.or_else(|| {
api_base_url
.map(str::trim)
.filter(|value| !value.is_empty())
.map(|_| "codeg".to_string())
})
}

/// OpenCode reads config from `$XDG_CONFIG_HOME/opencode` (falling back to
/// `~/.config/opencode`) and credentials from `$XDG_DATA_HOME/opencode`
/// (falling back to `~/.local/share/opencode`) on every platform. codeg must
Expand Down Expand Up @@ -3232,52 +3257,53 @@ fn persist_codex_local_config(config_patch_json: Option<&str>) -> Result<(), Acp
}
}

let provider_name = table
.get("model_provider")
.and_then(|value| value.as_str())
.map(str::trim)
.filter(|value| !value.is_empty())
.map(str::to_string)
.unwrap_or_else(|| "codeg".to_string());
table.insert(
"model_provider".to_string(),
toml::Value::String(provider_name.clone()),
);
let api_base_url = trim_non_empty(api_base_url);
let provider_name = codex_provider_name_for_write(table, api_base_url.as_deref());

let providers_item = table
.entry("model_providers".to_string())
.or_insert_with(|| toml::Value::Table(toml::map::Map::new()));
if !providers_item.is_table() {
*providers_item = toml::Value::Table(toml::map::Map::new());
}
let providers = providers_item
.as_table_mut()
.ok_or_else(|| AcpError::protocol("invalid model_providers table"))?;
let provider_item = providers
.entry(provider_name.clone())
.or_insert_with(|| toml::Value::Table(toml::map::Map::new()));
if !provider_item.is_table() {
*provider_item = toml::Value::Table(toml::map::Map::new());
}
let provider_table = provider_item
.as_table_mut()
.ok_or_else(|| AcpError::protocol("invalid model provider table"))?;
match trim_non_empty(api_base_url) {
Some(base_url) => {
provider_table.insert("base_url".to_string(), toml::Value::String(base_url));
if let Some(provider_name) = provider_name {
table.insert(
"model_provider".to_string(),
toml::Value::String(provider_name.clone()),
);

let providers_item = table
.entry("model_providers".to_string())
.or_insert_with(|| toml::Value::Table(toml::map::Map::new()));
if !providers_item.is_table() {
*providers_item = toml::Value::Table(toml::map::Map::new());
}
let providers = providers_item
.as_table_mut()
.ok_or_else(|| AcpError::protocol("invalid model_providers table"))?;
let provider_item = providers
.entry(provider_name.clone())
.or_insert_with(|| toml::Value::Table(toml::map::Map::new()));
if !provider_item.is_table() {
*provider_item = toml::Value::Table(toml::map::Map::new());
}
let provider_table = provider_item
.as_table_mut()
.ok_or_else(|| AcpError::protocol("invalid model provider table"))?;
match api_base_url.as_deref() {
Some(base_url) => {
provider_table.insert(
"base_url".to_string(),
toml::Value::String(base_url.to_string()),
);
}
None => {
provider_table.remove("base_url");
}
}
None => {
provider_table.remove("base_url");
if provider_name == "codeg" {
provider_table.insert("name".to_string(), toml::Value::String("codeg".to_string()));
provider_table.insert(
"wire_api".to_string(),
toml::Value::String("responses".to_string()),
);
ensure_codex_provider_auth_default(provider_table);
}
}
if provider_name == "codeg" {
provider_table.insert("name".to_string(), toml::Value::String("codeg".to_string()));
provider_table.insert(
"wire_api".to_string(),
toml::Value::String("responses".to_string()),
);
ensure_codex_provider_auth_default(provider_table);
}

if env.is_empty() {
table.remove("env");
Expand Down Expand Up @@ -9110,51 +9136,49 @@ fn cascade_update_agent_config(
.ok_or_else(|| AcpError::protocol("codex config root must be a TOML table"))?;
table.remove("api_base_url");

let provider_name = table
.get("model_provider")
.and_then(|value| value.as_str())
.map(str::trim)
.filter(|value| !value.is_empty())
.map(str::to_string)
.unwrap_or_else(|| "codeg".to_string());
table.insert(
"model_provider".to_string(),
toml::Value::String(provider_name.clone()),
);
let provider_name = codex_provider_name_for_write(table, Some(api_url));

let providers_item = table
.entry("model_providers".to_string())
.or_insert_with(|| toml::Value::Table(toml::map::Map::new()));
if !providers_item.is_table() {
*providers_item = toml::Value::Table(toml::map::Map::new());
}
let providers = providers_item
.as_table_mut()
.ok_or_else(|| AcpError::protocol("invalid model_providers table"))?;
let provider_item = providers
.entry(provider_name.clone())
.or_insert_with(|| toml::Value::Table(toml::map::Map::new()));
if !provider_item.is_table() {
*provider_item = toml::Value::Table(toml::map::Map::new());
}
let provider_table = provider_item
.as_table_mut()
.ok_or_else(|| AcpError::protocol("invalid model provider table"))?;
if api_url.trim().is_empty() {
provider_table.remove("base_url");
} else {
provider_table.insert(
"base_url".to_string(),
toml::Value::String(api_url.to_string()),
);
}
if provider_name == "codeg" {
provider_table.insert("name".to_string(), toml::Value::String("codeg".to_string()));
provider_table.insert(
"wire_api".to_string(),
toml::Value::String("responses".to_string()),
if let Some(provider_name) = provider_name {
table.insert(
"model_provider".to_string(),
toml::Value::String(provider_name.clone()),
);
ensure_codex_provider_auth_default(provider_table);

let providers_item = table
.entry("model_providers".to_string())
.or_insert_with(|| toml::Value::Table(toml::map::Map::new()));
if !providers_item.is_table() {
*providers_item = toml::Value::Table(toml::map::Map::new());
}
let providers = providers_item
.as_table_mut()
.ok_or_else(|| AcpError::protocol("invalid model_providers table"))?;
let provider_item = providers
.entry(provider_name.clone())
.or_insert_with(|| toml::Value::Table(toml::map::Map::new()));
if !provider_item.is_table() {
*provider_item = toml::Value::Table(toml::map::Map::new());
}
let provider_table = provider_item
.as_table_mut()
.ok_or_else(|| AcpError::protocol("invalid model provider table"))?;
if api_url.trim().is_empty() {
provider_table.remove("base_url");
} else {
provider_table.insert(
"base_url".to_string(),
toml::Value::String(api_url.to_string()),
);
}
if provider_name == "codeg" {
provider_table
.insert("name".to_string(), toml::Value::String("codeg".to_string()));
provider_table.insert(
"wire_api".to_string(),
toml::Value::String("responses".to_string()),
);
ensure_codex_provider_auth_default(provider_table);
}
}
match codex_model {
CodexModelAction::Set(model) => {
Expand Down Expand Up @@ -14874,6 +14898,89 @@ wire_api = "chat"
});
}

#[test]
fn codex_persist_keeps_a_providerless_config_providerless() {
let dir = tempfile::tempdir().expect("tempdir");
temp_env::with_var("CODEX_HOME", Some(dir.path()), || {
let patch = serde_json::json!({
"apiBaseUrl": "",
"apiKey": "",
"model": "gpt-5-codex",
"env": { "KEEP": "1" }
})
.to_string();
persist_codex_local_config(Some(&patch)).expect("persist must succeed");

let written = std::fs::read_to_string(dir.path().join("config.toml"))
.expect("read back");
let parsed = written.parse::<toml::Value>().expect("must parse");
let root = parsed.as_table().expect("root table");
assert_eq!(root.get("model").and_then(toml::Value::as_str), Some("gpt-5-codex"));
assert!(!root.contains_key("model_provider"));
assert!(!root.contains_key("model_providers"));
});
}

#[test]
fn codex_persist_does_not_activate_a_dormant_codeg_table() {
let dir = tempfile::tempdir().expect("tempdir");
temp_env::with_var("CODEX_HOME", Some(dir.path()), || {
let config_path = dir.path().join("config.toml");
std::fs::write(
&config_path,
"[model_providers.codeg]\nbase_url = \"\"\nkeep = \"user-value\"\n",
)
.expect("seed config.toml");
let patch = serde_json::json!({
"apiBaseUrl": "",
"apiKey": "",
"model": "gpt-5-codex",
"env": {}
})
.to_string();

persist_codex_local_config(Some(&patch)).expect("persist must succeed");

let written = std::fs::read_to_string(&config_path).expect("read back");
let parsed = written.parse::<toml::Value>().expect("must parse");
let root = parsed.as_table().expect("root table");
assert!(!root.contains_key("model_provider"));
let codeg = root
.get("model_providers")
.and_then(toml::Value::as_table)
.and_then(|providers| providers.get("codeg"))
.and_then(toml::Value::as_table)
.expect("dormant codeg table must survive");
assert_eq!(codeg.get("keep").and_then(toml::Value::as_str), Some("user-value"));
assert!(!codeg.contains_key("requires_openai_auth"));
assert!(!codeg.contains_key("wire_api"));
});
}

#[test]
fn codex_cascade_keeps_a_providerless_config_providerless() {
let dir = tempfile::tempdir().expect("tempdir");
temp_env::with_var("CODEX_HOME", Some(dir.path()), || {
cascade_update_agent_config(
AgentType::Codex,
"",
"",
&BTreeMap::new(),
&CodexModelAction::Set("gpt-5-codex".to_string()),
None,
)
.expect("cascade must succeed");

let written = std::fs::read_to_string(dir.path().join("config.toml"))
.expect("read back");
let parsed = written.parse::<toml::Value>().expect("must parse");
let root = parsed.as_table().expect("root table");
assert_eq!(root.get("model").and_then(toml::Value::as_str), Some("gpt-5-codex"));
assert!(!root.contains_key("model_provider"));
assert!(!root.contains_key("model_providers"));
});
}

#[test]
fn cursor_fingerprint_tracks_cli_config_changes() {
// Cursor's ~/.cursor/cli-config.json (permission rules / sandbox) is
Expand Down
Loading
Loading