fix(ai): default opencode backend to Local adapter kind
This commit is contained in:
parent
bea96f543d
commit
2261c5483c
1 changed files with 37 additions and 1 deletions
|
|
@ -91,13 +91,21 @@ pub fn resolve(_root: &Path, ov: &AiOverrides, conf: Option<&AiConfig>) -> Resol
|
|||
.and_then(|s| AiBackend::parse(&s))
|
||||
.unwrap_or(AiBackend::Direct);
|
||||
|
||||
let provider = ov
|
||||
let mut provider = ov
|
||||
.provider
|
||||
.clone()
|
||||
.or_else(|| env_var(ov.use_environment, "PHOEBUS_AI_PROVIDER"))
|
||||
.or_else(|| conf.map(|c| c.provider.clone()))
|
||||
.and_then(|s| ProviderKind::parse(&s))
|
||||
.unwrap_or(ProviderKind::None);
|
||||
// The OpenCode backend adapts OpenAI-shaped requests to the agent
|
||||
// server protocol; `Local` is the established adapter kind (the guided
|
||||
// install review uses it). Without this, `sys ask --ai-backend opencode`
|
||||
// resolves no provider and fails with "no AI provider selected" even
|
||||
// though server, provider and model are all configured.
|
||||
if backend == AiBackend::OpenCode && provider == ProviderKind::None {
|
||||
provider = ProviderKind::Local;
|
||||
}
|
||||
|
||||
let opencode_server = ov
|
||||
.opencode_server
|
||||
|
|
@ -331,6 +339,34 @@ mod tests {
|
|||
assert!(err.contains("could not load the provider API key"), "{err}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn opencode_backend_defaults_to_the_local_adapter_kind() {
|
||||
let ov = AiOverrides {
|
||||
backend: Some("opencode".into()),
|
||||
provider: None,
|
||||
model: None,
|
||||
endpoint: None,
|
||||
api_key_file: None,
|
||||
opencode_server: Some("http://127.0.0.1:4096".into()),
|
||||
opencode_provider: Some("opencode-go".into()),
|
||||
opencode_model: Some("muse-spark-1.3-contributor".into()),
|
||||
opencode_password_file: None,
|
||||
no_sandbox: true,
|
||||
use_environment: false,
|
||||
};
|
||||
let resolved = resolve(std::path::Path::new("/"), &ov, None);
|
||||
assert_eq!(resolved.backend, AiBackend::OpenCode);
|
||||
assert_eq!(resolved.provider, ProviderKind::Local);
|
||||
assert!(resolved.is_configured());
|
||||
// An explicit direct provider is still honored, never overwritten.
|
||||
let ov2 = AiOverrides {
|
||||
provider: Some("deepseek".into()),
|
||||
..ov
|
||||
};
|
||||
let resolved2 = resolve(std::path::Path::new("/"), &ov2, None);
|
||||
assert_eq!(resolved2.provider, ProviderKind::DeepSeek);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_keyed_provider_without_a_credential_fails_closed() {
|
||||
let exec = make_exec();
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue