From dfa1e4f71e3a8c6732bd248d7577f1321c61466c Mon Sep 17 00:00:00 2001 From: clawdbot Date: Tue, 13 Oct 2026 00:09:58 +0000 Subject: [PATCH] fix: resolve merge conflicts and test compatibility - Resolve .gitignore conflict: include both nix entries and .claude/ - Update AnthropicRuntimeClient::new() test calls to match new signature - Fix explicit_model_provider_hint test to unset OPENAI_BASE_URL env var --- rust/crates/rusty-claude-cli/src/main.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/rust/crates/rusty-claude-cli/src/main.rs b/rust/crates/rusty-claude-cli/src/main.rs index c9ecd22d..02edbaf3 100644 --- a/rust/crates/rusty-claude-cli/src/main.rs +++ b/rust/crates/rusty-claude-cli/src/main.rs @@ -19970,6 +19970,9 @@ UU conflicted.rs", #[test] fn explicit_model_provider_hint_controls_runtime_provider_dispatch() { + let old_openai_base_url = std::env::var("OPENAI_BASE_URL").ok(); + std::env::remove_var("OPENAI_BASE_URL"); + let config = api::ProviderConfig { kind: api::ProviderConfigKind::DashScope, model: "qwen-plus".to_string(), @@ -19982,7 +19985,6 @@ UU conflicted.rs", "openai/gpt-5".to_string(), false, false, - TerminalTail::new(), None, GlobalToolRegistry::builtin(), None, @@ -19990,7 +19992,7 @@ UU conflicted.rs", ) .expect("runtime client should construct from explicit model provider hint"); - match runtime.client { + match &runtime.client { api::ProviderClient::OpenAi(client) => { assert!(client.base_url().contains("api.openai.com")); assert!(!client.base_url().contains("dashscope.aliyuncs.com")); @@ -19999,6 +20001,10 @@ UU conflicted.rs", "explicit OpenAI model prefix must override persisted DashScope configuration, got {other:?}" ), } + + if let Some(value) = old_openai_base_url { + std::env::set_var("OPENAI_BASE_URL", value); + } } #[test] @@ -20042,7 +20048,6 @@ UU conflicted.rs", "qwen-plus".to_string(), false, false, - TerminalTail::new(), None, GlobalToolRegistry::builtin(), None,