Skip to content

Commit 147cd93

Browse files
committed
provider: keep Jcode model switches on managed subscription transport
1 parent 5ae0559 commit 147cd93

2 files changed

Lines changed: 32 additions & 9 deletions

File tree

‎crates/jcode-base/src/provider/jcode.rs‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ pub struct JcodeProvider {
1212

1313
impl JcodeProvider {
1414
fn runtime_model_spec(model: &str) -> String {
15-
// Subscription model ids overlap with direct providers (for example,
16-
// `claude-*` and `gpt-*`). Passing a bare id to MultiProvider lets its
17-
// family heuristic escape to the user's Anthropic/OpenAI credentials.
18-
// Pin the managed OpenRouter slot, whose transport is configured below
19-
// as `jcode-subscription`, for every curated model.
20-
format!("openrouter:{}", model.trim())
15+
// Use the explicit managed-subscription route. `openrouter:` denotes
16+
// BYOK and deliberately rebinds the shared slot to an OpenRouter key,
17+
// even if the slot previously held a managed subscription runtime.
18+
format!("jcode:{}", model.trim())
2119
}
2220

2321
pub fn new() -> Self {
@@ -337,15 +335,15 @@ mod tests {
337335
fn jcode_models_are_pinned_to_the_managed_transport() {
338336
assert_eq!(
339337
JcodeProvider::runtime_model_spec("claude-opus-5-5"),
340-
"openrouter:claude-opus-5-5"
338+
"jcode:claude-opus-5-5"
341339
);
342340
assert_eq!(
343341
JcodeProvider::runtime_model_spec("claude-haiku-5-5"),
344-
"openrouter:claude-haiku-5-5"
342+
"jcode:claude-haiku-5-5"
345343
);
346344
assert_eq!(
347345
JcodeProvider::runtime_model_spec("gpt-6.1-sol"),
348-
"openrouter:gpt-6.1-sol"
346+
"jcode:gpt-6.1-sol"
349347
);
350348
}
351349

‎crates/jcode-base/src/provider/tests/catalog_subscription.rs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -881,3 +881,28 @@ fn test_anthropic_pro_no_catalog_and_explicit_long_context_keep_legacy_gates() {
881881
assert_eq!(anthropic_oauth_route_availability(model), expected);
882882
});
883883
}
884+
#[test]
885+
fn test_jcode_provider_model_switch_does_not_require_openrouter_key() {
886+
with_clean_provider_test_env(|| {
887+
crate::env::set_var("JCODE_API_KEY", "jcode-test-subscription-key");
888+
crate::env::remove_var("OPENROUTER_API_KEY");
889+
let runtime = tokio::runtime::Runtime::new().expect("tokio runtime");
890+
runtime.block_on(async {
891+
let provider = crate::provider::jcode::JcodeProvider::new();
892+
for model in ["claude-haiku-5-5", "gpt-6.1-sol", "claude-opus-5-5"] {
893+
provider.set_model(model).expect("managed model switch");
894+
assert_eq!(provider.model(), model);
895+
assert_eq!(
896+
std::env::var("JCODE_OPENROUTER_TRANSPORT_STATE").as_deref(),
897+
Ok("jcode-subscription")
898+
);
899+
assert_eq!(
900+
std::env::var("JCODE_OPENROUTER_API_KEY_NAME").as_deref(),
901+
Ok("JCODE_API_KEY")
902+
);
903+
}
904+
assert!(std::env::var_os("OPENROUTER_API_KEY").is_none());
905+
});
906+
crate::env::remove_var("JCODE_API_KEY");
907+
});
908+
}

0 commit comments

Comments
 (0)