Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 44 additions & 0 deletions src/provider_catalog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,50 @@ fn apply_profile_key_based_endpoint_overrides(
.map(ToString::to_string)
.or_else(|| load_env_value_from_env_or_config(profile.api_key_env, profile.env_file));

// Issue #176-followup: MiniMax keys starting with `sk-cp-` originally
// shipped exclusively against MiniMax's China API. As of 2026 Q2,
// MiniMax's *global* console also issues `sk-cp-`-prefixed keys, so the
// prefix is no longer a reliable region signal — global users were
// getting auto-routed to `api.minimaxi.com` and seeing
// "invalid api key (2049)" 401s.
//
// Resolution order:
//
// 1. JCODE_MINIMAX_REGION env var (case-insensitive). Accepted values:
// "global" → force `api.minimax.io` (catalog default).
// "china" → force `api.minimaxi.com`.
// Anything else falls through to (2).
//
// 2. The `sk-cp-` prefix heuristic — preserved for backwards
// compatibility with existing China-region users who never set the
// env var. Routes to China.
//
// 3. Catalog default (`api.minimax.io` global).
let region_override = std::env::var("JCODE_MINIMAX_REGION")
.ok()
.map(|s| s.trim().to_ascii_lowercase());

match region_override.as_deref() {
Some("global") | Some("international") | Some("io") => {
// Catalog default is global; nothing to do — but log so users
// know the override took effect.
return;
}
Some("china") | Some("cn") | Some("minimaxi") => {
resolved.api_base = MINIMAX_CHINA_API_BASE.to_string();
resolved.setup_url = MINIMAX_CHINA_SETUP_URL.to_string();
return;
}
Some(other) if !other.is_empty() => {
eprintln!(
"Warning: ignoring invalid JCODE_MINIMAX_REGION={other:?}. \
Valid values: global, china."
);
// Fall through to the prefix heuristic for backwards compat.
}
_ => {}
}

if key
.as_deref()
.map(|key| key.trim_start().starts_with("sk-cp-"))
Expand Down
89 changes: 89 additions & 0 deletions src/provider_catalog_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,95 @@ fn minimax_token_plan_keys_route_to_china_even_when_openai_api_key_env_is_intern
assert_eq!(resolved.setup_url, MINIMAX_CHINA_SETUP_URL);
}

#[test]
fn minimax_region_global_override_keeps_international_endpoint_for_sk_cp_keys() {
// MiniMax's global console issues sk-cp-prefixed keys too, so the
// auto-routing-by-prefix would dump them on api.minimaxi.com and 401.
// JCODE_MINIMAX_REGION=global must force the catalog default
// (api.minimax.io) regardless of the prefix.
let _lock = crate::storage::lock_test_env();
let _guard = EnvGuard::save(&["OPENAI_API_KEY", "JCODE_MINIMAX_REGION"]);
crate::env::remove_var("OPENAI_API_KEY");
crate::env::set_var("JCODE_MINIMAX_REGION", "global");

let resolved = resolve_openai_compatible_profile_with_api_key_hint(
MINIMAX_PROFILE,
Some("sk-cp-actually-a-global-key"),
);
assert_eq!(
resolved.api_base, "https://api.minimax.io/v1",
"JCODE_MINIMAX_REGION=global must beat the sk-cp- → China heuristic"
);
}

#[test]
fn minimax_region_china_override_routes_even_without_sk_cp_prefix() {
let _lock = crate::storage::lock_test_env();
let _guard = EnvGuard::save(&["OPENAI_API_KEY", "JCODE_MINIMAX_REGION"]);
crate::env::remove_var("OPENAI_API_KEY");
crate::env::set_var("JCODE_MINIMAX_REGION", "china");

let resolved = resolve_openai_compatible_profile_with_api_key_hint(
MINIMAX_PROFILE,
Some("any-non-sk-cp-key"),
);
assert_eq!(resolved.api_base, MINIMAX_CHINA_API_BASE);
assert_eq!(resolved.setup_url, MINIMAX_CHINA_SETUP_URL);
}

#[test]
fn minimax_region_invalid_value_falls_through_to_prefix_heuristic() {
let _lock = crate::storage::lock_test_env();
let _guard = EnvGuard::save(&["OPENAI_API_KEY", "JCODE_MINIMAX_REGION"]);
crate::env::remove_var("OPENAI_API_KEY");
crate::env::set_var("JCODE_MINIMAX_REGION", "garbage");

// Invalid override → prefix heuristic still picks China for sk-cp- keys.
let resolved = resolve_openai_compatible_profile_with_api_key_hint(
MINIMAX_PROFILE,
Some("sk-cp-token-plan"),
);
assert_eq!(resolved.api_base, MINIMAX_CHINA_API_BASE);

// And global default for non-prefix keys.
let resolved2 = resolve_openai_compatible_profile_with_api_key_hint(
MINIMAX_PROFILE,
Some("sk-international"),
);
assert_eq!(resolved2.api_base, "https://api.minimax.io/v1");
}

#[test]
fn minimax_region_aliases_accept_io_cn_minimaxi() {
let _lock = crate::storage::lock_test_env();
let _guard = EnvGuard::save(&["OPENAI_API_KEY", "JCODE_MINIMAX_REGION"]);
crate::env::remove_var("OPENAI_API_KEY");

for global_alias in ["global", "international", "io", "GLOBAL", " Global "] {
crate::env::set_var("JCODE_MINIMAX_REGION", global_alias);
let resolved = resolve_openai_compatible_profile_with_api_key_hint(
MINIMAX_PROFILE,
Some("sk-cp-test"),
);
assert_eq!(
resolved.api_base, "https://api.minimax.io/v1",
"{global_alias:?} should route to global"
);
}

for china_alias in ["china", "cn", "minimaxi", "CHINA"] {
crate::env::set_var("JCODE_MINIMAX_REGION", china_alias);
let resolved = resolve_openai_compatible_profile_with_api_key_hint(
MINIMAX_PROFILE,
Some("sk-international-test"),
);
assert_eq!(
resolved.api_base, MINIMAX_CHINA_API_BASE,
"{china_alias:?} should route to China"
);
}
}

#[test]
fn auth_issue_lan_openai_compatible_bases_are_valid_for_local_model_servers() {
assert_eq!(
Expand Down