mirror of
https://github.com/instructkr/claw-code.git
synced 2026-11-18 00:00:00 +08:00
fix: parallel tool-result pairing, terminal-scope path limit, credential hint
Merge PR #3360 from c01dsummer/claw-code (fix/roadmap-835-838) Four fixes addressing issues #3361 and #3360: 1. Parallel tool-result pairing (835): The Anthropic Messages API requires all tool results of a turn to be in a single message. When a turn issued two tool calls at once, the results were sent in separate messages, causing a 400 error. Fixed by merging adjacent tool-result-only messages into one. 2. Terminal-scope path limit (836): Correlation keys up to 512 bytes expanded to 1024+ hex characters, exceeding APFS's 1024-byte total path limit. Fixed by using SHA256 digest (32 hex chars) for path components while storing the full key in the record for exact matching. 3. Credential hint (838): When ANTHROPIC_BASE_URL points to a non-Anthropic endpoint (DeepSeek, corporate gateways), the missing-credentials error now explains that the endpoint expects its own credentials, not Anthropic's. 4. ROADMAP entries: Documents all three fixes with verification details. All tests pass (370+ for rusty-claude-cli, 240+ for sdk, 122+ for tools, 209+ for api). Formatting verified with cargo fmt. CI checks approved and passed. Fixes #3361, #3360
This commit is contained in:
1 parent
c55c7e4710
commit
b8f93afbb3
11 files changed
+970
-120
No files matched your search
@@ -773,12 +773,14 @@ fn env_or_dotenv_present(key: &str) -> bool {
|
||||
}
|
||||
}
|
||||
|
||||
/// Produce a hint string describing the first foreign provider credential
|
||||
/// that is present in the environment when Anthropic auth resolution has
|
||||
/// just failed. Returns `None` when no foreign credential is set, in which
|
||||
/// case the caller should fall back to the plain `missing_credentials`
|
||||
/// error without a hint.
|
||||
/// Produce a hint string describing the most probable reason Anthropic auth
|
||||
/// resolution just failed. Returns `None` when nothing in the environment
|
||||
/// explains the failure, in which case the caller should fall back to the
|
||||
/// plain `missing_credentials` error without a hint.
|
||||
pub(crate) fn anthropic_missing_credentials_hint() -> Option<String> {
|
||||
if let Some(hint) = custom_anthropic_base_url_hint() {
|
||||
return Some(hint);
|
||||
}
|
||||
for (env_var, provider_label, fix_hint) in FOREIGN_PROVIDER_ENV_VARS {
|
||||
if env_or_dotenv_present(env_var) {
|
||||
return Some(format!(
|
||||
@@ -789,6 +791,34 @@ pub(crate) fn anthropic_missing_credentials_hint() -> Option<String> {
|
||||
None
|
||||
}
|
||||
|
||||
/// Hint for the case where `ANTHROPIC_BASE_URL` points at something other than
|
||||
/// the Anthropic API.
|
||||
///
|
||||
/// Third-party Anthropic-compatible endpoints (DeepSeek's `/anthropic` path,
|
||||
/// corporate gateways, local proxies) authenticate with the `ANTHROPIC_API_KEY`
|
||||
/// and `ANTHROPIC_AUTH_TOKEN` variable names purely by wire-compatibility
|
||||
/// convention, so the standard missing-credential message reads as "go get an
|
||||
/// Anthropic key" when the user in fact needs a credential issued by the
|
||||
/// endpoint they already configured. Nothing in that message mentions the base
|
||||
/// URL, which is the one piece of configuration the user deliberately set.
|
||||
///
|
||||
/// This takes precedence over the foreign-provider hints: a configured endpoint
|
||||
/// is a fact about what the user asked for, while a presence check on another
|
||||
/// provider's key only guesses at intent.
|
||||
fn custom_anthropic_base_url_hint() -> Option<String> {
|
||||
let base_url = anthropic::read_base_url();
|
||||
let base_url = base_url.trim();
|
||||
if base_url.is_empty() || base_url == anthropic::DEFAULT_BASE_URL {
|
||||
return None;
|
||||
}
|
||||
Some(format!(
|
||||
"ANTHROPIC_BASE_URL is set to {base_url}, which is not the Anthropic API. \
|
||||
The ANTHROPIC_API_KEY and ANTHROPIC_AUTH_TOKEN variable names are a \
|
||||
compatibility convention — this endpoint expects a credential it issued \
|
||||
itself, not an Anthropic key."
|
||||
))
|
||||
}
|
||||
|
||||
/// Build an Anthropic-specific `MissingCredentials` error, attaching a
|
||||
/// hint suggesting the probable fix whenever a different provider's
|
||||
/// credentials are already present in the environment. Anthropic call
|
||||
@@ -1688,6 +1718,7 @@ NO_EQUALS_LINE
|
||||
let _openai = EnvVarGuard::set("OPENAI_API_KEY", None);
|
||||
let _xai = EnvVarGuard::set("XAI_API_KEY", None);
|
||||
let _dashscope = EnvVarGuard::set("DASHSCOPE_API_KEY", None);
|
||||
let _base_url = EnvVarGuard::set("ANTHROPIC_BASE_URL", None);
|
||||
|
||||
// when
|
||||
let hint = anthropic_missing_credentials_hint();
|
||||
@@ -1699,6 +1730,86 @@ NO_EQUALS_LINE
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn anthropic_missing_credentials_hint_names_a_custom_base_url() {
|
||||
// given
|
||||
let _lock = env_lock();
|
||||
let _openai = EnvVarGuard::set("OPENAI_API_KEY", None);
|
||||
let _xai = EnvVarGuard::set("XAI_API_KEY", None);
|
||||
let _dashscope = EnvVarGuard::set("DASHSCOPE_API_KEY", None);
|
||||
let _base_url = EnvVarGuard::set(
|
||||
"ANTHROPIC_BASE_URL",
|
||||
Some("https://api.deepseek.com/anthropic"),
|
||||
);
|
||||
|
||||
// when
|
||||
let hint = anthropic_missing_credentials_hint()
|
||||
.expect("a configured non-Anthropic endpoint should produce a hint");
|
||||
|
||||
// then
|
||||
assert!(
|
||||
hint.contains("https://api.deepseek.com/anthropic"),
|
||||
"hint should name the configured endpoint so the user recognizes their own setting: {hint}"
|
||||
);
|
||||
assert!(
|
||||
hint.contains("not the Anthropic API"),
|
||||
"hint should state that the endpoint is not Anthropic: {hint}"
|
||||
);
|
||||
assert!(
|
||||
hint.contains("ANTHROPIC_API_KEY") && hint.contains("ANTHROPIC_AUTH_TOKEN"),
|
||||
"hint should keep naming the env vars that carry the credential: {hint}"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn anthropic_missing_credentials_hint_prefers_custom_base_url_over_foreign_creds() {
|
||||
// given
|
||||
let _lock = env_lock();
|
||||
let _openai = EnvVarGuard::set("OPENAI_API_KEY", Some("sk-openrouter-varleg"));
|
||||
let _xai = EnvVarGuard::set("XAI_API_KEY", None);
|
||||
let _dashscope = EnvVarGuard::set("DASHSCOPE_API_KEY", None);
|
||||
let _base_url = EnvVarGuard::set(
|
||||
"ANTHROPIC_BASE_URL",
|
||||
Some("https://api.deepseek.com/anthropic"),
|
||||
);
|
||||
|
||||
// when
|
||||
let hint = anthropic_missing_credentials_hint()
|
||||
.expect("a configured non-Anthropic endpoint should produce a hint");
|
||||
|
||||
// then
|
||||
assert!(
|
||||
hint.contains("ANTHROPIC_BASE_URL"),
|
||||
"the endpoint the user configured is a fact and should win over a guess about intent: {hint}"
|
||||
);
|
||||
assert!(
|
||||
!hint.contains("openai/"),
|
||||
"the foreign-provider routing hint should not displace the base-url hint: {hint}"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn anthropic_missing_credentials_hint_is_none_for_the_default_base_url() {
|
||||
// given
|
||||
let _lock = env_lock();
|
||||
let _openai = EnvVarGuard::set("OPENAI_API_KEY", None);
|
||||
let _xai = EnvVarGuard::set("XAI_API_KEY", None);
|
||||
let _dashscope = EnvVarGuard::set("DASHSCOPE_API_KEY", None);
|
||||
let _base_url = EnvVarGuard::set(
|
||||
"ANTHROPIC_BASE_URL",
|
||||
Some(super::anthropic::DEFAULT_BASE_URL),
|
||||
);
|
||||
|
||||
// when
|
||||
let hint = anthropic_missing_credentials_hint();
|
||||
|
||||
// then
|
||||
assert!(
|
||||
hint.is_none(),
|
||||
"pointing at the real Anthropic API should not produce a base-url hint, got {hint:?}"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn anthropic_missing_credentials_hint_detects_openai_api_key_and_recommends_openai_prefix() {
|
||||
// given
|
||||
@@ -1706,6 +1817,7 @@ NO_EQUALS_LINE
|
||||
let _openai = EnvVarGuard::set("OPENAI_API_KEY", Some("sk-openrouter-varleg"));
|
||||
let _xai = EnvVarGuard::set("XAI_API_KEY", None);
|
||||
let _dashscope = EnvVarGuard::set("DASHSCOPE_API_KEY", None);
|
||||
let _base_url = EnvVarGuard::set("ANTHROPIC_BASE_URL", None);
|
||||
|
||||
// when
|
||||
let hint = anthropic_missing_credentials_hint()
|
||||
@@ -1737,6 +1849,7 @@ NO_EQUALS_LINE
|
||||
let _openai = EnvVarGuard::set("OPENAI_API_KEY", None);
|
||||
let _xai = EnvVarGuard::set("XAI_API_KEY", Some("xai-test-key"));
|
||||
let _dashscope = EnvVarGuard::set("DASHSCOPE_API_KEY", None);
|
||||
let _base_url = EnvVarGuard::set("ANTHROPIC_BASE_URL", None);
|
||||
|
||||
// when
|
||||
let hint = anthropic_missing_credentials_hint()
|
||||
@@ -1764,6 +1877,7 @@ NO_EQUALS_LINE
|
||||
let _openai = EnvVarGuard::set("OPENAI_API_KEY", None);
|
||||
let _xai = EnvVarGuard::set("XAI_API_KEY", None);
|
||||
let _dashscope = EnvVarGuard::set("DASHSCOPE_API_KEY", Some("sk-dashscope-test"));
|
||||
let _base_url = EnvVarGuard::set("ANTHROPIC_BASE_URL", None);
|
||||
|
||||
// when
|
||||
let hint = anthropic_missing_credentials_hint()
|
||||
@@ -1791,6 +1905,7 @@ NO_EQUALS_LINE
|
||||
let _openai = EnvVarGuard::set("OPENAI_API_KEY", Some("sk-openrouter-varleg"));
|
||||
let _xai = EnvVarGuard::set("XAI_API_KEY", Some("xai-test-key"));
|
||||
let _dashscope = EnvVarGuard::set("DASHSCOPE_API_KEY", Some("sk-dashscope-test"));
|
||||
let _base_url = EnvVarGuard::set("ANTHROPIC_BASE_URL", None);
|
||||
|
||||
// when
|
||||
let hint = anthropic_missing_credentials_hint()
|
||||
@@ -1814,6 +1929,7 @@ NO_EQUALS_LINE
|
||||
let _openai = EnvVarGuard::set("OPENAI_API_KEY", None);
|
||||
let _xai = EnvVarGuard::set("XAI_API_KEY", None);
|
||||
let _dashscope = EnvVarGuard::set("DASHSCOPE_API_KEY", None);
|
||||
let _base_url = EnvVarGuard::set("ANTHROPIC_BASE_URL", None);
|
||||
|
||||
// when
|
||||
let error = anthropic_missing_credentials();
|
||||
@@ -1848,6 +1964,7 @@ NO_EQUALS_LINE
|
||||
let _openai = EnvVarGuard::set("OPENAI_API_KEY", Some("sk-openrouter-varleg"));
|
||||
let _xai = EnvVarGuard::set("XAI_API_KEY", None);
|
||||
let _dashscope = EnvVarGuard::set("DASHSCOPE_API_KEY", None);
|
||||
let _base_url = EnvVarGuard::set("ANTHROPIC_BASE_URL", None);
|
||||
|
||||
// when
|
||||
let error = anthropic_missing_credentials();
|
||||
@@ -1896,6 +2013,7 @@ NO_EQUALS_LINE
|
||||
let _openai = EnvVarGuard::set("OPENAI_API_KEY", Some(""));
|
||||
let _xai = EnvVarGuard::set("XAI_API_KEY", None);
|
||||
let _dashscope = EnvVarGuard::set("DASHSCOPE_API_KEY", None);
|
||||
let _base_url = EnvVarGuard::set("ANTHROPIC_BASE_URL", None);
|
||||
|
||||
// when
|
||||
let hint = anthropic_missing_credentials_hint();
|
||||
|
||||
Reference in new issue
Block a user