Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Fix Zed upgrade prompts for non-Zed payment errors (#64094)
Conrad Irwinfffb52c6dd27
diff --git a/crates/agent_ui/src/conversation_view.rs b/crates/agent_ui/src/conversation_view.rsindex 87fa65dbd22..c72b01c3874 100644--- a/crates/agent_ui/src/conversation_view.rs+++ b/crates/agent_ui/src/conversation_view.rs@@ -34,7 +34,9 @@ use gpui::{linear_gradient, list, pulsating_between,};use language::{Buffer, Language, Rope};-use language_model::{LanguageModelCompletionError, ProviderErrorCategory};+use language_model::{+ LanguageModelCompletionError, ProviderErrorCategory, ZED_CLOUD_PROVIDER_NAME,+};use markdown::{CodeBlockRenderer, CopyButtonVisibility, Markdown, MarkdownElement, MarkdownFont, MarkdownStyle,};@@ -122,7 +124,7 @@ enum ThreadFeedback {#[derive(Debug)]pub(crate) enum ThreadError {- PaymentRequired,+ ZedPaymentRequired,DataRetentionConsentRequired,Refusal,AuthenticationRequired(SharedString),@@ -186,7 +188,11 @@ impl From<anyhow::Error> for ThreadError {provider: provider.to_string().into(),},ProviderErrorCategory::PromptTooLarge { .. } => Self::PromptTooLarge,- ProviderErrorCategory::PaymentRequired => Self::PaymentRequired,+ ProviderErrorCategory::PaymentRequired+ if provider == &ZED_CLOUD_PROVIDER_NAME =>+ {+ Self::ZedPaymentRequired+ }ProviderErrorCategory::Authentication => Self::AuthenticationFailed {provider: provider.to_string().into(),},@@ -199,6 +205,7 @@ impl From<anyhow::Error> for ThreadError {},ProviderErrorCategory::InvalidEncryptedContent| ProviderErrorCategory::ContentPolicy+ | ProviderErrorCategory::PaymentRequired| ProviderErrorCategory::InvalidRequest| ProviderErrorCategory::Conflict| ProviderErrorCategory::Timeout@@ -3750,6 +3757,56 @@ pub(crate) mod tests {));}+ #[test]+ fn test_payment_required_preserves_non_zed_provider_message() {+ for provider in [+ language_model::LanguageModelProviderName::new("OpenRouter"),+ language_model::OPEN_AI_PROVIDER_NAME,+ language_model::ANTHROPIC_PROVIDER_NAME,+ ] {+ for status in [None, Some(http_client::StatusCode::PAYMENT_REQUIRED)] {+ let provider_error = LanguageModelCompletionError::from_provider_response(+ provider.clone(),+ status,+ Some("402".to_string()),+ "Insufficient credits. Add credits to your account.".to_string(),+ None,+ ProviderErrorCategory::PaymentRequired,+ );++ let error = ThreadError::from(anyhow!(provider_error));++ assert!(+ matches!(+ &error,+ ThreadError::ProviderRejection { message }+ if message == "Insufficient credits. Add credits to your account."+ ),+ "expected provider billing message for {provider}, got: {error:?}"+ );+ }+ }+ }++ #[test]+ fn test_payment_required_from_zed_uses_upgrade_prompt() {+ let provider_error = LanguageModelCompletionError::from_provider_response(+ ZED_CLOUD_PROVIDER_NAME,+ Some(http_client::StatusCode::PAYMENT_REQUIRED),+ None,+ "Payment required".to_string(),+ None,+ ProviderErrorCategory::PaymentRequired,+ );++ let error = ThreadError::from(anyhow!(provider_error));++ assert!(+ matches!(error, ThreadError::ZedPaymentRequired),+ "expected Zed upgrade prompt, got: {error:?}"+ );+ }+#[gpui::test]async fn test_drop(cx: &mut TestAppContext) {init_test(cx);diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rsindex 26187c7045c..8a2a77465ff 100644--- a/crates/agent_ui/src/conversation_view/thread_view.rs+++ b/crates/agent_ui/src/conversation_view/thread_view.rs@@ -1864,7 +1864,7 @@ impl ThreadView {fn emit_thread_error_telemetry(&self, error: &ThreadError, cx: &mut Context<Self>) {let (error_kind, acp_error_code, message): (&str, Option<SharedString>, SharedString) =match error {- ThreadError::PaymentRequired => (+ ThreadError::ZedPaymentRequired => ("payment_required",None,"You reached your free usage limit. Upgrade to Zed Pro for more prompts."@@ -11050,7 +11050,7 @@ impl ThreadView {ThreadError::AuthenticationRequired(error) => {self.render_authentication_required_error(error.clone(), cx)}- ThreadError::PaymentRequired => self.render_payment_required_error(cx),+ ThreadError::ZedPaymentRequired => self.render_zed_payment_required_error(cx),ThreadError::RateLimitExceeded { provider } => self.render_error_callout("Rate Limit Reached",format!(@@ -11183,7 +11183,7 @@ impl ThreadView {.dismiss_action(self.dismiss_error_button(cx))}- fn render_payment_required_error(&self, cx: &mut Context<Self>) -> Callout {+ fn render_zed_payment_required_error(&self, cx: &mut Context<Self>) -> Callout {const ERROR_MESSAGE: &str ="You reached your free usage limit. Upgrade to Zed Pro for more prompts.";