An agent-managed museum exhibit, built in Rust with Gajae-Code / LazyCodex — developed and maintained with no human intervention.
Rust
feat: API timeout config, Retry-After header support, and configurable retry
TheArchitectitd8c57ed3170e
diff --git a/rust/crates/api/src/error.rs b/rust/crates/api/src/error.rsindex 1dc4fb29..5373d6f0 100644--- a/rust/crates/api/src/error.rs+++ b/rust/crates/api/src/error.rs@@ -60,6 +60,9 @@ pub enum ApiError {retryable: bool,/// Suggested user action based on error type (e.g., "Reduce prompt size" for 413)suggested_action: Option<String>,+ /// Parsed Retry-After header value (seconds) for 429 responses.+ /// When present, overrides the exponential backoff delay.+ retry_after: Option<Duration>,},RetriesExhausted {attempts: u32,@@ -128,6 +131,18 @@ impl ApiError {}#[must_use]+ /// Return the `Retry-After` delay if this error came from a 429 response+ /// that included a `retry-after` header. Callers should prefer this value+ /// over the computed backoff delay when it exists.+ #[must_use]+ pub fn retry_after(&self) -> Option<Duration> {+ match self {+ Self::Api { retry_after, .. } => *retry_after,+ Self::RetriesExhausted { last_error, .. } => last_error.retry_after(),+ _ => None,+ }+ }+pub fn is_retryable(&self) -> bool {match self {Self::Http(error) => error.is_connect() || error.is_timeout() || error.is_request(),@@ -499,6 +514,7 @@ mod tests {body: String::new(),retryable: true,suggested_action: None,+ retry_after: None,};assert!(error.is_generic_fatal_wrapper());@@ -522,6 +538,7 @@ mod tests {body: String::new(),retryable: true,suggested_action: None,+ retry_after: None,}),};@@ -543,6 +560,7 @@ mod tests {body: String::new(),retryable: false,suggested_action: None,+ retry_after: None,};assert!(error.is_context_window_failure());diff --git a/rust/crates/api/src/http_client.rs b/rust/crates/api/src/http_client.rsindex 921288eb..648a0811 100644--- a/rust/crates/api/src/http_client.rs+++ b/rust/crates/api/src/http_client.rs@@ -1,9 +1,69 @@+use std::time::Duration;+use crate::error::ApiError;const HTTP_PROXY_KEYS: [&str; 2] = ["HTTP_PROXY", "http_proxy"];const HTTPS_PROXY_KEYS: [&str; 2] = ["HTTPS_PROXY", "https_proxy"];const NO_PROXY_KEYS: [&str; 2] = ["NO_PROXY", "no_proxy"];+/// Timeout configuration for outbound HTTP requests.+///+/// When set, the `reqwest::Client` will abort requests that take longer+/// than the configured duration and return a timeout error (which is+/// retryable by the existing exponential backoff logic).+#[derive(Debug, Clone, Copy, PartialEq, Eq)]+pub struct TimeoutConfig {+ /// Maximum time to wait for a connection to be established.+ /// Defaults to 30 seconds.+ pub connect_timeout: Duration,+ /// Maximum time for the entire request (including reading the response+ /// body). For streaming responses this is the timeout for the initial+ /// handshake only; the stream itself is governed by SSE parsing.+ /// Defaults to 5 minutes (300 seconds).+ pub request_timeout: Duration,+}++impl Default for TimeoutConfig {+ fn default() -> Self {+ Self {+ connect_timeout: Duration::from_secs(30),+ request_timeout: Duration::from_secs(300),+ }+ }+}++impl TimeoutConfig {+ /// Read timeout settings from the process environment.+ /// - `CLAW_API_CONNECT_TIMEOUT` — connect timeout in seconds+ /// - `CLAW_API_REQUEST_TIMEOUT` — overall request timeout in seconds+ #[must_use]+ pub fn from_env() -> Self {+ let connect_timeout = std::env::var("CLAW_API_CONNECT_TIMEOUT")+ .ok()+ .and_then(|v| v.parse::<u64>().ok())+ .map(Duration::from_secs)+ .unwrap_or(Duration::from_secs(30));+ let request_timeout = std::env::var("CLAW_API_REQUEST_TIMEOUT")+ .ok()+ .and_then(|v| v.parse::<u64>().ok())+ .map(Duration::from_secs)+ .unwrap_or(Duration::from_secs(300));+ Self {+ connect_timeout,+ request_timeout,+ }+ }++ /// Create from explicit second values (used by config file parsing).+ #[must_use]+ pub fn from_seconds(connect_secs: u64, request_secs: u64) -> Self {+ Self {+ connect_timeout: Duration::from_secs(connect_secs),+ request_timeout: Duration::from_secs(request_secs),+ }+ }+}+/// Snapshot of the proxy-related environment variables that influence the/// outbound HTTP client. Captured up front so callers can inspect, log, and/// test the resolved configuration without re-reading the process environment.@@ -61,7 +121,7 @@ impl ProxyConfig {/// `HTTPS_PROXY`, and `NO_PROXY` environment variables. When no proxy is/// configured the client behaves identically to `reqwest::Client::new()`.pub fn build_http_client() -> Result<reqwest::Client, ApiError> {- build_http_client_with(&ProxyConfig::from_env())+ build_http_client_with_opts(&ProxyConfig::from_env(), &TimeoutConfig::from_env())}/// Infallible counterpart to [`build_http_client`] for constructors that@@ -71,12 +131,13 @@ pub fn build_http_client() -> Result<reqwest::Client, ApiError> {/// first outbound request instead of at construction time.#[must_use]pub fn build_http_client_or_default() -> reqwest::Client {- build_http_client().unwrap_or_else(|_| {- reqwest::Client::builder()- .user_agent("clawd-rust-tools/0.1")- .build()- .expect("default client with user_agent should always succeed")- })+ build_http_client_with_opts(&ProxyConfig::from_env(), &TimeoutConfig::from_env())+ .unwrap_or_else(|_| {+ reqwest::Client::builder()+ .user_agent("clawd-rust-tools/0.1")+ .build()+ .expect("default client with user_agent should always succeed")+ })}/// Build a `reqwest::Client` from an explicit [`ProxyConfig`]. Used by tests@@ -86,9 +147,20 @@ pub fn build_http_client_or_default() -> reqwest::Client {/// and `https_proxy` fields and is registered as both an HTTP and HTTPS/// proxy so a single value can route every outbound request.pub fn build_http_client_with(config: &ProxyConfig) -> Result<reqwest::Client, ApiError> {+ build_http_client_with_opts(config, &TimeoutConfig::from_env())+}++/// Build a `reqwest::Client` from explicit [`ProxyConfig`] and [`TimeoutConfig`].+/// Used by callers that want to control both proxy routing and request timing.+pub fn build_http_client_with_opts(+ config: &ProxyConfig,+ timeout: &TimeoutConfig,+) -> Result<reqwest::Client, ApiError> {let mut builder = reqwest::Client::builder().no_proxy()- .user_agent("clawd-rust-tools/0.1");+ .user_agent("clawd-rust-tools/0.1")+ .connect_timeout(timeout.connect_timeout)+ .timeout(timeout.request_timeout);let no_proxy = config.no_proxy@@ -131,7 +203,7 @@ wheremod tests {use std::collections::HashMap;- use super::{build_http_client_with, ProxyConfig};+ use super::{build_http_client_with, build_http_client_with_opts, ProxyConfig, TimeoutConfig};fn config_from_map(pairs: &[(&str, &str)]) -> ProxyConfig {let map: HashMap<String, String> = pairs@@ -143,30 +215,19 @@ mod tests {#[test]fn proxy_config_is_empty_when_no_env_vars_are_set() {- // givenlet config = config_from_map(&[]);-- // when- let empty = config.is_empty();-- // then- assert!(empty);+ assert!(config.is_empty());assert_eq!(config, ProxyConfig::default());}#[test]fn proxy_config_reads_uppercase_http_https_and_no_proxy() {- // givenlet pairs = [("HTTP_PROXY", "http://proxy.internal:3128"),("HTTPS_PROXY", "http://secure.internal:3129"),("NO_PROXY", "localhost,127.0.0.1,.corp"),];-- // whenlet config = config_from_map(&pairs);-- // thenassert_eq!(config.http_proxy.as_deref(),Some("http://proxy.internal:3128")@@ -184,17 +245,12 @@ mod tests {#[test]fn proxy_config_falls_back_to_lowercase_keys() {- // givenlet pairs = [("http_proxy", "http://lower.internal:3128"),("https_proxy", "http://lower-secure.internal:3129"),("no_proxy", ".lower"),];-- // whenlet config = config_from_map(&pairs);-- // thenassert_eq!(config.http_proxy.as_deref(),Some("http://lower.internal:3128")@@ -208,16 +264,11 @@ mod tests {#[test]fn proxy_config_prefers_uppercase_over_lowercase_when_both_set() {- // givenlet pairs = [("HTTP_PROXY", "http://upper.internal:3128"),("http_proxy", "http://lower.internal:3128"),];-- // whenlet config = config_from_map(&pairs);-- // thenassert_eq!(config.http_proxy.as_deref(),Some("http://upper.internal:3128")@@ -226,59 +277,39 @@ mod tests {#[test]fn proxy_config_treats_empty_strings_as_unset() {- // givenlet pairs = [("HTTP_PROXY", ""), ("http_proxy", "")];-- // whenlet config = config_from_map(&pairs);-- // thenassert!(config.http_proxy.is_none());}#[test]fn build_http_client_succeeds_when_no_proxy_is_configured() {- // givenlet config = ProxyConfig::default();-- // whenlet result = build_http_client_with(&config);-- // thenassert!(result.is_ok());}#[test]fn build_http_client_succeeds_with_valid_http_and_https_proxies() {- // givenlet config = ProxyConfig {http_proxy: Some("http://proxy.internal:3128".to_string()),https_proxy: Some("http://secure.internal:3129".to_string()),no_proxy: Some("localhost,127.0.0.1".to_string()),proxy_url: None,};-- // whenlet result = build_http_client_with(&config);-- // thenassert!(result.is_ok());}#[test]fn build_http_client_returns_http_error_for_invalid_proxy_url() {- // givenlet config = ProxyConfig {http_proxy: None,https_proxy: Some("not a url".to_string()),no_proxy: None,proxy_url: None,};-- // whenlet result = build_http_client_with(&config);-- // thenlet error = result.expect_err("invalid proxy URL must be reported as a build failure");assert!(matches!(error, crate::error::ApiError::Http(_)),@@ -288,10 +319,7 @@ mod tests {#[test]fn from_proxy_url_sets_unified_field_and_leaves_per_scheme_empty() {- // given / whenlet config = ProxyConfig::from_proxy_url("http://unified.internal:3128");-- // thenassert_eq!(config.proxy_url.as_deref(),Some("http://unified.internal:3128")@@ -303,49 +331,56 @@ mod tests {#[test]fn build_http_client_succeeds_with_unified_proxy_url() {- // givenlet config = ProxyConfig {proxy_url: Some("http://unified.internal:3128".to_string()),no_proxy: Some("localhost".to_string()),..ProxyConfig::default()};-- // whenlet result = build_http_client_with(&config);-- // thenassert!(result.is_ok());}#[test]fn proxy_url_takes_precedence_over_per_scheme_fields() {- // given – both per-scheme and unified are setlet config = ProxyConfig {http_proxy: Some("http://per-scheme.internal:1111".to_string()),https_proxy: Some("http://per-scheme.internal:2222".to_string()),no_proxy: None,proxy_url: Some("http://unified.internal:3128".to_string()),};-- // when – building succeeds (the unified URL is valid)let result = build_http_client_with(&config);-- // thenassert!(result.is_ok());}#[test]fn build_http_client_returns_error_for_invalid_unified_proxy_url() {- // givenlet config = ProxyConfig::from_proxy_url("not a url");-- // whenlet result = build_http_client_with(&config);-- // thenassert!(matches!(result, Err(crate::error::ApiError::Http(_))),"invalid unified proxy URL should fail: {result:?}");}++ #[test]+ fn timeout_config_defaults() {+ let config = TimeoutConfig::default();+ assert_eq!(config.connect_timeout, std::time::Duration::from_secs(30));+ assert_eq!(config.request_timeout, std::time::Duration::from_secs(300));+ }++ #[test]+ fn timeout_config_from_seconds() {+ let config = TimeoutConfig::from_seconds(10, 60);+ assert_eq!(config.connect_timeout, std::time::Duration::from_secs(10));+ assert_eq!(config.request_timeout, std::time::Duration::from_secs(60));+ }++ #[test]+ fn build_http_client_with_custom_timeouts() {+ let config = ProxyConfig::default();+ let timeout = TimeoutConfig::from_seconds(5, 120);+ let result = build_http_client_with_opts(&config, &timeout);+ assert!(result.is_ok());+ }}diff --git a/rust/crates/api/src/lib.rs b/rust/crates/api/src/lib.rsindex e6624a3e..a5b7d726 100644--- a/rust/crates/api/src/lib.rs+++ b/rust/crates/api/src/lib.rs@@ -12,7 +12,9 @@ pub use client::{};pub use error::ApiError;pub use http_client::{- build_http_client, build_http_client_or_default, build_http_client_with, ProxyConfig,+ TimeoutConfig,+ build_http_client, build_http_client_or_default, build_http_client_with,+ build_http_client_with_opts, ProxyConfig,};pub use prompt_cache::{CacheBreakEvent, PromptCache, PromptCacheConfig, PromptCachePaths, PromptCacheRecord,diff --git a/rust/crates/api/src/providers/anthropic.rs b/rust/crates/api/src/providers/anthropic.rsindex 51e10b44..83059a43 100644--- a/rust/crates/api/src/providers/anthropic.rs+++ b/rust/crates/api/src/providers/anthropic.rs@@ -211,6 +211,19 @@ impl AnthropicClient {self}+ /// Replace the internal HTTP client with one that respects the given+ /// timeout configuration. This controls connect and request-level+ /// timeouts for all outbound API calls.+ #[must_use]+ pub fn with_timeout(mut self, timeout: &crate::http_client::TimeoutConfig) -> Self {+ self.http = crate::http_client::build_http_client_with_opts(+ &crate::http_client::ProxyConfig::from_env(),+ timeout,+ )+ .unwrap_or_else(|_| reqwest::Client::new());+ self+ }+#[must_use]pub fn with_session_tracer(mut self, session_tracer: SessionTracer) -> Self {self.session_tracer = Some(session_tracer);@@ -454,7 +467,12 @@ impl AnthropicClient {break;}- tokio::time::sleep(self.jittered_backoff_for_attempt(attempts)?).await;+ let delay = if let Some(retry_after) = last_error.as_ref().and_then(|e| e.retry_after()) {+ retry_after+ } else {+ self.jittered_backoff_for_attempt(attempts)?+ };+ tokio::time::sleep(delay).await;}Err(ApiError::RetriesExhausted {@@ -868,10 +886,12 @@ async fn expect_success(response: reqwest::Response) -> Result<reqwest::Responsereturn Ok(response);}- let request_id = request_id_from_headers(response.headers());+ let headers = response.headers().clone();+ let request_id = request_id_from_headers(&headers);let body = response.text().await.unwrap_or_else(|_| String::new());let parsed_error = serde_json::from_str::<AnthropicErrorEnvelope>(&body).ok();let retryable = is_retryable_status(status);+ let retry_after = parse_retry_after(&headers, status);Err(ApiError::Api {status,@@ -885,9 +905,21 @@ async fn expect_success(response: reqwest::Response) -> Result<reqwest::Responsebody,retryable,suggested_action: None,+ retry_after,})}+fn parse_retry_after(headers: &reqwest::header::HeaderMap, status: reqwest::StatusCode) -> Option<std::time::Duration> {+ if status != reqwest::StatusCode::TOO_MANY_REQUESTS {+ return None;+ }+ headers+ .get("retry-after")+ .and_then(|v| v.to_str().ok())+ .and_then(|v| v.parse::<u64>().ok())+ .map(std::time::Duration::from_secs)+}+const fn is_retryable_status(status: reqwest::StatusCode) -> bool {matches!(status.as_u16(), 408 | 409 | 429 | 500 | 502 | 503 | 504)}@@ -910,6 +942,8 @@ fn enrich_bearer_auth_error(error: ApiError, auth: &AuthSource) -> ApiError {body,retryable,suggested_action,+ retry_after,+ ..} = errorelse {return error;@@ -923,6 +957,7 @@ fn enrich_bearer_auth_error(error: ApiError, auth: &AuthSource) -> ApiError {body,retryable,suggested_action,+ retry_after,};}let Some(bearer_token) = auth.bearer_token() else {@@ -934,6 +969,7 @@ fn enrich_bearer_auth_error(error: ApiError, auth: &AuthSource) -> ApiError {body,retryable,suggested_action,+ retry_after,};};if !bearer_token.starts_with("sk-ant-") {@@ -945,6 +981,7 @@ fn enrich_bearer_auth_error(error: ApiError, auth: &AuthSource) -> ApiError {body,retryable,suggested_action,+ retry_after,};}// Only append the hint when the AuthSource is pure BearerToken. If both@@ -960,6 +997,7 @@ fn enrich_bearer_auth_error(error: ApiError, auth: &AuthSource) -> ApiError {body,retryable,suggested_action,+ retry_after,};}let enriched_message = match message {@@ -974,6 +1012,7 @@ fn enrich_bearer_auth_error(error: ApiError, auth: &AuthSource) -> ApiError {body,retryable,suggested_action,+ retry_after,}}@@ -1562,6 +1601,7 @@ mod tests {body: String::new(),retryable: false,suggested_action: None,+ retry_after: None,};// when@@ -1603,6 +1643,7 @@ mod tests {body: String::new(),retryable: true,suggested_action: None,+ retry_after: None,};// when@@ -1632,6 +1673,7 @@ mod tests {body: String::new(),retryable: false,suggested_action: None,+ retry_after: None,};// when@@ -1660,6 +1702,7 @@ mod tests {body: String::new(),retryable: false,suggested_action: None,+ retry_after: None,};// when@@ -1685,6 +1728,7 @@ mod tests {body: String::new(),retryable: false,suggested_action: None,+ retry_after: None,};// whendiff --git a/rust/crates/api/src/providers/openai_compat.rs b/rust/crates/api/src/providers/openai_compat.rsindex d5291b8e..c349e5d1 100644--- a/rust/crates/api/src/providers/openai_compat.rs+++ b/rust/crates/api/src/providers/openai_compat.rs@@ -165,6 +165,18 @@ impl OpenAiCompatClient {self}+ /// Replace the internal HTTP client with one that respects the given+ /// timeout configuration.+ #[must_use]+ pub fn with_timeout(mut self, timeout: &crate::http_client::TimeoutConfig) -> Self {+ self.http = crate::http_client::build_http_client_with_opts(+ &crate::http_client::ProxyConfig::from_env(),+ timeout,+ )+ .unwrap_or_else(|_| reqwest::Client::new());+ self+ }+pub async fn send_message(&self,request: &MessageRequest,@@ -207,6 +219,7 @@ impl OpenAiCompatClient {reqwest::StatusCode::from_u16(code.unwrap_or(400)).unwrap_or(reqwest::StatusCode::BAD_REQUEST),),+ retry_after: None,});}}@@ -260,7 +273,12 @@ impl OpenAiCompatClient {break retryable_error;}- tokio::time::sleep(self.jittered_backoff_for_attempt(attempts)?).await;+ let delay = if let Some(retry_after) = retryable_error.retry_after() {+ retry_after+ } else {+ self.jittered_backoff_for_attempt(attempts)?+ };+ tokio::time::sleep(delay).await;};Err(ApiError::RetriesExhausted {@@ -1503,6 +1521,7 @@ fn parse_sse_frame(body: trimmed.chars().take(500).collect(),retryable: false,suggested_action: suggested_action_for_status(status),+ retry_after: None,});}}@@ -1518,6 +1537,7 @@ fn parse_sse_frame(body: trimmed.chars().take(200).collect(),retryable: false,suggested_action: Some("verify the API endpoint URL is correct".to_string()),+ retry_after: None,});}return Ok(None);@@ -1553,6 +1573,7 @@ fn parse_sse_frame(body: payload.clone(),retryable: false,suggested_action: suggested_action_for_status(status),+ retry_after: None,});}}@@ -1569,6 +1590,7 @@ fn parse_sse_frame(body: payload.chars().take(200).collect(),retryable: false,suggested_action: Some("verify the API endpoint URL is correct".to_string()),+ retry_after: None,});}serde_json::from_str::<ChatCompletionChunk>(&payload)@@ -1620,10 +1642,12 @@ async fn expect_success(response: reqwest::Response) -> Result<reqwest::Responsereturn Ok(response);}- let request_id = request_id_from_headers(response.headers());+ let headers = response.headers().clone();+ let request_id = request_id_from_headers(&headers);let body = response.text().await.unwrap_or_default();let parsed_error = serde_json::from_str::<ErrorEnvelope>(&body).ok();let retryable = is_retryable_status(status);+ let retry_after = parse_retry_after(&headers, status);let suggested_action = suggested_action_for_status(status);@@ -1639,9 +1663,21 @@ async fn expect_success(response: reqwest::Response) -> Result<reqwest::Responsebody,retryable,suggested_action,+ retry_after,})}+fn parse_retry_after(headers: &reqwest::header::HeaderMap, status: reqwest::StatusCode) -> Option<std::time::Duration> {+ if status != reqwest::StatusCode::TOO_MANY_REQUESTS {+ return None;+ }+ headers+ .get("retry-after")+ .and_then(|v| v.to_str().ok())+ .and_then(|v| v.parse::<u64>().ok())+ .map(std::time::Duration::from_secs)+}+const fn is_retryable_status(status: reqwest::StatusCode) -> bool {matches!(status.as_u16(), 408 | 409 | 429 | 500 | 502 | 503 | 504)}diff --git a/rust/crates/runtime/src/config.rs b/rust/crates/runtime/src/config.rsindex 0379e31b..46639b75 100644--- a/rust/crates/runtime/src/config.rs+++ b/rust/crates/runtime/src/config.rs@@ -81,6 +81,27 @@ pub struct RuntimePluginConfig {max_output_tokens: Option<u32>,}+/// API timeout and retry configuration.+#[derive(Debug, Clone, PartialEq, Eq)]+pub struct ApiTimeoutConfig {+ /// Connect timeout in seconds. Defaults to 30.+ pub connect_timeout_secs: u64,+ /// Request timeout in seconds. Defaults to 300 (5 minutes).+ pub request_timeout_secs: u64,+ /// Maximum retry attempts on transient failures. Defaults to 8.+ pub max_retries: u32,+}++impl Default for ApiTimeoutConfig {+ fn default() -> Self {+ Self {+ connect_timeout_secs: 30,+ request_timeout_secs: 300,+ max_retries: 8,+ }+ }+}+/// Structured feature configuration consumed by runtime subsystems.#[derive(Debug, Clone, PartialEq, Eq, Default)]pub struct RuntimeFeatureConfig {@@ -95,6 +116,7 @@ pub struct RuntimeFeatureConfig {sandbox: SandboxConfig,provider_fallbacks: ProviderFallbackConfig,trusted_roots: Vec<String>,+ api_timeout: ApiTimeoutConfig,}/// Ordered chain of fallback model identifiers used when the primary@@ -353,6 +375,7 @@ impl ConfigLoader {sandbox: parse_optional_sandbox_config(&merged_value)?,provider_fallbacks: parse_optional_provider_fallbacks(&merged_value)?,trusted_roots: parse_optional_trusted_roots(&merged_value)?,+ api_timeout: parse_optional_api_timeout_config(&merged_value)?,};Ok(RuntimeConfig {@@ -410,6 +433,7 @@ impl ConfigLoader {sandbox: parse_optional_sandbox_config(&merged_value)?,provider_fallbacks: parse_optional_provider_fallbacks(&merged_value)?,trusted_roots: parse_optional_trusted_roots(&merged_value)?,+ api_timeout: parse_optional_api_timeout_config(&merged_value)?,};let config = RuntimeConfig {@@ -1152,6 +1176,28 @@ fn parse_optional_provider_fallbacks(Ok(ProviderFallbackConfig { primary, fallbacks })}+fn parse_optional_api_timeout_config(root: &JsonValue) -> Result<ApiTimeoutConfig, ConfigError> {+ let Some(timeout_value) = root.as_object().and_then(|obj| obj.get("apiTimeout")) else {+ return Ok(ApiTimeoutConfig::default());+ };+ let Some(obj) = timeout_value.as_object() else {+ return Ok(ApiTimeoutConfig::default());+ };+ let context = "merged settings.apiTimeout";+ let connect_timeout_secs = optional_u64(obj, "connectTimeout", context)?+ .unwrap_or(30);+ let request_timeout_secs = optional_u64(obj, "requestTimeout", context)?+ .unwrap_or(300);+ let max_retries = optional_u64(obj, "maxRetries", context)?+ .map(|v| v as u32)+ .unwrap_or(8);+ Ok(ApiTimeoutConfig {+ connect_timeout_secs,+ request_timeout_secs,+ max_retries,+ })+}+fn parse_optional_trusted_roots(root: &JsonValue) -> Result<Vec<String>, ConfigError> {let Some(object) = root.as_object() else {return Ok(Vec::new());diff --git a/rust/crates/runtime/src/lib.rs b/rust/crates/runtime/src/lib.rsindex f0ab67c3..4cdba8fc 100644--- a/rust/crates/runtime/src/lib.rs+++ b/rust/crates/runtime/src/lib.rs@@ -65,12 +65,13 @@ pub use compact::{get_compact_continuation_message, should_compact, CompactionConfig, CompactionResult,};pub use config::{- suppress_config_warnings_for_json_mode, ConfigEntry, ConfigError, ConfigLoader, ConfigSource,+ ApiTimeoutConfig, ConfigEntry, ConfigError, ConfigLoader, ConfigSource,McpConfigCollection, McpManagedProxyServerConfig, McpOAuthConfig, McpRemoteServerConfig,McpSdkServerConfig, McpServerConfig, McpStdioServerConfig, McpTransport,McpWebSocketServerConfig, OAuthConfig, ProviderFallbackConfig, ResolvedPermissionMode,RuntimeConfig, RuntimeFeatureConfig, RuntimeHookConfig, RuntimePermissionRuleConfig,- RuntimePluginConfig, ScopedMcpServerConfig, CLAW_SETTINGS_SCHEMA_NAME,+ RuntimePluginConfig, ScopedMcpServerConfig, suppress_config_warnings_for_json_mode,+ CLAW_SETTINGS_SCHEMA_NAME,};pub use config_validate::{check_unsupported_format, format_diagnostics, validate_config_file, ConfigDiagnostic,diff --git a/rust/crates/rusty-claude-cli/src/main.rs b/rust/crates/rusty-claude-cli/src/main.rsindex 5febf841..417d1e09 100644--- a/rust/crates/rusty-claude-cli/src/main.rs+++ b/rust/crates/rusty-claude-cli/src/main.rs@@ -11570,7 +11570,8 @@ mod tests {body: String::new(),retryable: true,suggested_action: None,- };+ retry_after: None,+};let rendered = format_user_visible_api_error("session-issue-22", &error);assert!(rendered.contains("provider_internal"));@@ -11593,7 +11594,8 @@ mod tests {body: String::new(),retryable: true,suggested_action: None,- }),+ retry_after: None,+}),};let rendered = format_user_visible_api_error("session-issue-22", &error);@@ -11657,7 +11659,8 @@ mod tests {body: String::new(),retryable: false,suggested_action: None,- };+ retry_after: None,+};let rendered = format_user_visible_api_error("session-issue-32", &error);assert!(rendered.contains("context_window_blocked"), "{rendered}");@@ -11724,7 +11727,8 @@ mod tests {body: String::new(),retryable: false,suggested_action: None,- }),+ retry_after: None,+}),};let rendered = format_user_visible_api_error("session-issue-32", &error);