Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
language_models: Avoid sending Bedrock cache-point-only messages (#59436)
Yi Liu6eaad52c29a0
diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rsindex 7d07261f641..ba3b587151a 100644--- a/crates/language_models/src/provider/bedrock.rs+++ b/crates/language_models/src/provider/bedrock.rs@@ -1025,7 +1025,7 @@ pub fn into_bedrock(}}).collect();- if message.cache && supports_caching {+ if message.cache && supports_caching && !bedrock_message_content.is_empty() {bedrock_message_content.push(BedrockInnerContent::CachePoint(CachePointBlock::builder().r#type(CachePointType::Default)@@ -1747,3 +1747,91 @@ impl ConfigurationView {)}}++#[cfg(test)]+mod tests {+ use super::*;+ use language_model::LanguageModelRequestMessage;++ fn into_bedrock_request(messages: Vec<LanguageModelRequestMessage>) -> bedrock::Request {+ into_bedrock(+ LanguageModelRequest {+ messages,+ ..Default::default()+ },+ "claude-sonnet-4-5".to_string(),+ 1.0,+ 4096,+ BedrockModelMode::Default,+ true,+ true,+ None,+ None,+ )+ .unwrap()+ }++ #[test]+ fn test_cache_marked_message_that_filters_to_empty_is_dropped() {+ let request = into_bedrock_request(vec![+ LanguageModelRequestMessage {+ role: Role::User,+ content: vec![MessageContent::Text("What's the weather?".into())],+ cache: false,+ reasoning_details: None,+ },+ LanguageModelRequestMessage {+ role: Role::Assistant,+ content: vec![MessageContent::Thinking {+ text: "Let me think about this...".into(),+ signature: None,+ }],+ cache: true,+ reasoning_details: None,+ },+ LanguageModelRequestMessage {+ role: Role::User,+ content: vec![MessageContent::Text("Summarize this conversation.".into())],+ cache: false,+ reasoning_details: None,+ },+ ]);++ for message in &request.messages {+ assert!(+ message+ .content()+ .iter()+ .any(|block| !matches!(block, BedrockInnerContent::CachePoint(_))),+ "message must not consist solely of cache points: {:?}",+ message+ );+ }+ assert!(+ request+ .messages+ .iter()+ .all(|message| *message.role() == bedrock::BedrockRole::User),+ "the assistant message stripped to empty content should be dropped entirely"+ );+ }++ #[test]+ fn test_cache_marked_message_with_content_gets_cache_point() {+ let request = into_bedrock_request(vec![LanguageModelRequestMessage {+ role: Role::User,+ content: vec![MessageContent::Text("What's the weather?".into())],+ cache: true,+ reasoning_details: None,+ }]);++ assert_eq!(request.messages.len(), 1);+ assert!(+ matches!(+ request.messages[0].content().last(),+ Some(BedrockInnerContent::CachePoint(_))+ ),+ "a cache-marked message with content should end with a cache point"+ );+ }+}