Lightweight coding agent that runs in your terminal
Rust
Use curly apostrophes in protocol error messages (#43961)
mingze-openai8c72f2ff564f
diff --git a/codex-rs/protocol/src/error.rs b/codex-rs/protocol/src/error.rsindex be0192f61a..fad51f2b96 100644--- a/codex-rs/protocol/src/error.rs+++ b/codex-rs/protocol/src/error.rs@@ -95,6 +95,7 @@ pub enum CodexErrorDetails {/// A retryable upstream rate limit received inside the response stream.#[error("rate limit exceeded: {0}")]RateLimitExceeded(String),+ // The iOS input-limit classifier matches this message's ASCII prefix.#[error("Codex ran out of room in the model's context window. Start a new thread or clear earlier history before retrying.")]@@ -151,7 +152,7 @@ pub enum CodexErrorDetails {"To use Codex with your ChatGPT plan, upgrade to Plus: https://chatgpt.com/explore/plus.")]UsageNotIncluded,- #[error("We're currently experiencing high demand, which may cause temporary errors.")]+ #[error("We’re currently experiencing high demand, which may cause temporary errors.")]InternalServerError,/// Retry limit exceeded.#[error("{0}")]@@ -663,7 +664,7 @@ impl std::fmt::Display for UsageLimitReachedError {{return write!(f,- "You've hit your usage limit for {limit_name}. Switch to another model now,{}",+ "You’ve hit your usage limit for {limit_name}. Switch to another model now,{}",retry_suffix_after_or(self.resets_at.as_ref()));}@@ -703,14 +704,14 @@ impl std::fmt::Display for UsageLimitReachedError {if let Some(promo_message) = &self.promo_message {return write!(f,- "You've hit your usage limit. {promo_message},{}",+ "You’ve hit your usage limit. {promo_message},{}",retry_suffix_after_or(self.resets_at.as_ref()));}let message = match self.plan_type.as_ref() {Some(PlanType::Known(KnownPlan::Plus)) => format!(- "You've hit your usage limit. Upgrade to Pro (https://chatgpt.com/explore/pro), visit https://chatgpt.com/codex/settings/usage to purchase more credits{}",+ "You’ve hit your usage limit. Upgrade to Pro (https://chatgpt.com/explore/pro), visit https://chatgpt.com/codex/settings/usage to purchase more credits{}",retry_suffix_after_or(self.resets_at.as_ref())),Some(PlanType::Known(@@ -723,28 +724,28 @@ impl std::fmt::Display for UsageLimitReachedError {| KnownPlan::EnterpriseCbpUsageBased,)) => {format!(- "You've hit your usage limit. To get more access now, send a request to your admin{}",+ "You’ve hit your usage limit. To get more access now, send a request to your admin{}",retry_suffix_after_or(self.resets_at.as_ref()))}Some(PlanType::Known(KnownPlan::Free)) | Some(PlanType::Known(KnownPlan::Go)) => {format!(- "You've hit your usage limit. Upgrade to Plus to continue using Codex (https://chatgpt.com/explore/plus),{}",+ "You’ve hit your usage limit. Upgrade to Plus to continue using Codex (https://chatgpt.com/explore/plus),{}",retry_suffix_after_or(self.resets_at.as_ref()))}Some(PlanType::Known(KnownPlan::Pro | KnownPlan::ProLite)) => format!(- "You've hit your usage limit. Visit https://chatgpt.com/codex/settings/usage to purchase more credits{}",+ "You’ve hit your usage limit. Visit https://chatgpt.com/codex/settings/usage to purchase more credits{}",retry_suffix_after_or(self.resets_at.as_ref())),Some(PlanType::Known(KnownPlan::Enterprise | KnownPlan::Edu | KnownPlan::EduPlus | KnownPlan::EduPro,)) => format!(- "You've hit your usage limit.{}",+ "You’ve hit your usage limit.{}",retry_suffix(self.resets_at.as_ref())),Some(PlanType::Unknown(_)) | None => format!(- "You've hit your usage limit.{}",+ "You’ve hit your usage limit.{}",retry_suffix(self.resets_at.as_ref())),};diff --git a/codex-rs/protocol/src/error_tests.rs b/codex-rs/protocol/src/error_tests.rsindex ca0b7b2cff..5357867ef0 100644--- a/codex-rs/protocol/src/error_tests.rs+++ b/codex-rs/protocol/src/error_tests.rs@@ -127,7 +127,7 @@ fn usage_limit_reached_error_formats_plus_plan() {};assert_eq!(err.to_string(),- "You've hit your usage limit. Upgrade to Pro (https://chatgpt.com/explore/pro), visit https://chatgpt.com/codex/settings/usage to purchase more credits or try again later."+ "You’ve hit your usage limit. Upgrade to Pro (https://chatgpt.com/explore/pro), visit https://chatgpt.com/codex/settings/usage to purchase more credits or try again later.");}@@ -136,7 +136,7 @@ fn usage_limit_reached_error_formats_rate_limit_reached_types() {let cases = [(RateLimitReachedType::RateLimitReached,- "You've hit your usage limit. Upgrade to Pro (https://chatgpt.com/explore/pro), visit https://chatgpt.com/codex/settings/usage to purchase more credits or try again later.",+ "You’ve hit your usage limit. Upgrade to Pro (https://chatgpt.com/explore/pro), visit https://chatgpt.com/codex/settings/usage to purchase more credits or try again later.",),(RateLimitReachedType::WorkspaceOwnerCreditsDepleted,@@ -289,7 +289,7 @@ fn usage_limit_reached_error_formats_free_plan() {};assert_eq!(err.to_string(),- "You've hit your usage limit. Upgrade to Plus to continue using Codex (https://chatgpt.com/explore/plus), or try again later."+ "You’ve hit your usage limit. Upgrade to Plus to continue using Codex (https://chatgpt.com/explore/plus), or try again later.");}@@ -304,7 +304,7 @@ fn usage_limit_reached_error_formats_go_plan() {};assert_eq!(err.to_string(),- "You've hit your usage limit. Upgrade to Plus to continue using Codex (https://chatgpt.com/explore/plus), or try again later."+ "You’ve hit your usage limit. Upgrade to Plus to continue using Codex (https://chatgpt.com/explore/plus), or try again later.");}@@ -319,7 +319,7 @@ fn usage_limit_reached_error_formats_default_when_none() {};assert_eq!(err.to_string(),- "You've hit your usage limit. Try again later."+ "You’ve hit your usage limit. Try again later.");}@@ -337,7 +337,7 @@ fn usage_limit_reached_error_formats_team_plan() {rate_limit_reached_type: None,};let expected = format!(- "You've hit your usage limit. To get more access now, send a request to your admin or try again at {expected_time}."+ "You’ve hit your usage limit. To get more access now, send a request to your admin or try again at {expected_time}.");assert_eq!(err.to_string(), expected);});@@ -359,7 +359,7 @@ fn usage_limit_reached_error_formats_business_plan_without_reset() {};assert_eq!(err.to_string(),- "You've hit your usage limit. To get more access now, send a request to your admin or try again later."+ "You’ve hit your usage limit. To get more access now, send a request to your admin or try again later.");}}@@ -375,7 +375,7 @@ fn usage_limit_reached_error_formats_self_serve_business_prolite_plan() {};assert_eq!(err.to_string(),- "You've hit your usage limit. To get more access now, send a request to your admin or try again later."+ "You’ve hit your usage limit. To get more access now, send a request to your admin or try again later.");}@@ -390,7 +390,7 @@ fn usage_limit_reached_error_formats_self_serve_business_usage_based_plan() {};assert_eq!(err.to_string(),- "You've hit your usage limit. To get more access now, send a request to your admin or try again later."+ "You’ve hit your usage limit. To get more access now, send a request to your admin or try again later.");}@@ -405,7 +405,7 @@ fn usage_limit_reached_error_formats_enterprise_cbp_usage_based_plan() {};assert_eq!(err.to_string(),- "You've hit your usage limit. To get more access now, send a request to your admin or try again later."+ "You’ve hit your usage limit. To get more access now, send a request to your admin or try again later.");}@@ -426,7 +426,7 @@ fn usage_limit_reached_error_formats_default_for_other_plans() {};assert_eq!(err.to_string(),- "You've hit your usage limit. Try again later."+ "You’ve hit your usage limit. Try again later.");}}@@ -445,7 +445,7 @@ fn usage_limit_reached_error_formats_pro_plan_with_reset() {rate_limit_reached_type: None,};let expected = format!(- "You've hit your usage limit. Visit https://chatgpt.com/codex/settings/usage to purchase more credits or try again at {expected_time}."+ "You’ve hit your usage limit. Visit https://chatgpt.com/codex/settings/usage to purchase more credits or try again at {expected_time}.");assert_eq!(err.to_string(), expected);});@@ -472,7 +472,7 @@ fn usage_limit_reached_error_hides_upsell_for_non_codex_limit_name() {rate_limit_reached_type: None,};let expected = format!(- "You've hit your usage limit for codex_other. Switch to another model now, or try again at {expected_time}."+ "You’ve hit your usage limit for codex_other. Switch to another model now, or try again at {expected_time}.");assert_eq!(err.to_string(), expected);});@@ -491,7 +491,7 @@ fn usage_limit_reached_includes_minutes_when_available() {promo_message: None,rate_limit_reached_type: None,};- let expected = format!("You've hit your usage limit. Try again at {expected_time}.");+ let expected = format!("You’ve hit your usage limit. Try again at {expected_time}.");assert_eq!(err.to_string(), expected);});}@@ -636,7 +636,7 @@ fn usage_limit_reached_includes_hours_and_minutes() {rate_limit_reached_type: None,};let expected = format!(- "You've hit your usage limit. Upgrade to Pro (https://chatgpt.com/explore/pro), visit https://chatgpt.com/codex/settings/usage to purchase more credits or try again at {expected_time}."+ "You’ve hit your usage limit. Upgrade to Pro (https://chatgpt.com/explore/pro), visit https://chatgpt.com/codex/settings/usage to purchase more credits or try again at {expected_time}.");assert_eq!(err.to_string(), expected);});@@ -656,7 +656,7 @@ fn usage_limit_reached_includes_days_hours_minutes() {promo_message: None,rate_limit_reached_type: None,};- let expected = format!("You've hit your usage limit. Try again at {expected_time}.");+ let expected = format!("You’ve hit your usage limit. Try again at {expected_time}.");assert_eq!(err.to_string(), expected);});}@@ -674,7 +674,7 @@ fn usage_limit_reached_less_than_minute() {promo_message: None,rate_limit_reached_type: None,};- let expected = format!("You've hit your usage limit. Try again at {expected_time}.");+ let expected = format!("You’ve hit your usage limit. Try again at {expected_time}.");assert_eq!(err.to_string(), expected);});}@@ -695,7 +695,7 @@ fn usage_limit_reached_with_promo_message() {rate_limit_reached_type: None,};let expected = format!(- "You've hit your usage limit. To continue using Codex, start a free trial of <PLAN> today, or try again at {expected_time}."+ "You’ve hit your usage limit. To continue using Codex, start a free trial of <PLAN> today, or try again at {expected_time}.");assert_eq!(err.to_string(), expected);});