fix(clippy): box ApiError::Api payload to clear result_large_err

`ApiError` is the `Err` half of nearly every `Result` in the api crate, and
its `Api` variant carried ~139 bytes inline (8 fields, four of them
`Option<String>`). That tripped clippy::result_large_err on 35 signatures
and, with -D warnings, made the whole crate unbuildable under the repo's
own documented verification command.

Move the payload into `ApiErrorDetails` behind a `Box`:
  - `ApiError::Api(Box<ApiErrorDetails>)`, with `ApiError::api(..)` to
    construct and `api_details()` to borrow
  - `ApiErrorDetails` re-exported from the crate root
  - adding a field here can no longer re-inflate every signature

This also simplifies `enrich_bearer_auth_error`, which previously
destructured and rebuilt all eight fields at five separate return points
just to append a hint; it now mutates the boxed payload in place.

Also clears the remaining pre-existing lints that blocked -D warnings:
unused test bindings, a redundant `use serde_json`, and an explicit
`.into_iter()` in claw-rag-service.

Verified: cargo test --workspace passes, 0 failures.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Q9McEEH32ZtyM62GSXVSyJ
(cherry picked from commit e9210bd75eb76e5d88b2ae797f537102bcabd41d)
This commit is contained in:
reacechalmers authored and clawdbot committed 2026-10-12 22:58:19 +00:00
1 parent 4361e98998
commit cd01ffc5f3
9 files changed
+148 -182

No files matched your search

+16 -14
View File
@@ -13242,8 +13242,8 @@ fn format_context_window_blocked_error(session_id: &str, error: &api::ApiError)
));
lines.push(format!(" Context window {context_window_tokens} tokens"));
}
api::ApiError::Api { message, body, .. } => {
let detail = message.as_deref().unwrap_or(body).trim();
api::ApiError::Api(details) => {
let detail = details.message.as_deref().unwrap_or(&details.body).trim();
if !detail.is_empty() {
lines.push(format!(
" Detail {}",
@@ -13253,7 +13253,9 @@ fn format_context_window_blocked_error(session_id: &str, error: &api::ApiError)
}
api::ApiError::RetriesExhausted { last_error, .. } => {
let detail = match last_error.as_ref() {
api::ApiError::Api { message, body, .. } => message.as_deref().unwrap_or(body),
api::ApiError::Api(details) => {
details.message.as_deref().unwrap_or(&details.body)
}
other => return format_context_window_blocked_error(session_id, other),
}
.trim();
@@ -14556,7 +14558,7 @@ mod tests {
SessionLifecycleSummary, SlashCommand, StatusUsage, TerminalTail, TmuxPaneSnapshot,
DEFAULT_MODEL, LATEST_SESSION_REFERENCE, STUB_COMMANDS,
};
use api::{ApiError, MessageResponse, OutputContentBlock, Usage};
use api::{ApiError, ApiErrorDetails, MessageResponse, OutputContentBlock, Usage};
use plugins::{
PluginManager, PluginManagerConfig, PluginTool, PluginToolDefinition, PluginToolPermission,
};
@@ -14601,7 +14603,7 @@ mod tests {
#[test]
fn opaque_provider_wrapper_surfaces_failure_class_session_and_trace() {
let error = ApiError::Api {
let error = ApiError::Api(Box::new(ApiErrorDetails {
status: "500".parse().expect("status"),
error_type: Some("api_error".to_string()),
message: Some(
@@ -14613,7 +14615,7 @@ mod tests {
retryable: true,
suggested_action: None,
retry_after: None,
};
}));
let rendered = format_user_visible_api_error("session-issue-22", &error);
assert!(rendered.contains("provider_internal"));
@@ -14625,7 +14627,7 @@ mod tests {
fn retry_exhaustion_uses_retry_failure_class_for_generic_provider_wrapper() {
let error = ApiError::RetriesExhausted {
attempts: 3,
last_error: Box::new(ApiError::Api {
last_error: Box::new(ApiError::Api(Box::new(ApiErrorDetails {
status: "502".parse().expect("status"),
error_type: Some("api_error".to_string()),
message: Some(
@@ -14637,7 +14639,7 @@ mod tests {
retryable: true,
suggested_action: None,
retry_after: None,
}),
}))),
};
let rendered = format_user_visible_api_error("session-issue-22", &error);
@@ -14690,7 +14692,7 @@ mod tests {
#[test]
fn provider_context_window_errors_are_reframed_with_same_guidance() {
let error = ApiError::Api {
let error = ApiError::Api(Box::new(ApiErrorDetails {
status: "400".parse().expect("status"),
error_type: Some("invalid_request_error".to_string()),
message: Some(
@@ -14702,7 +14704,7 @@ mod tests {
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}");
@@ -14724,7 +14726,7 @@ mod tests {
#[test]
fn openai_configured_limit_errors_are_rendered_as_context_window_guidance() {
let error = ApiError::Api {
let error = ApiError::Api(Box::new(ApiErrorDetails {
status: "400".parse().expect("status"),
error_type: Some("invalid_request_error".to_string()),
message: Some(
@@ -14736,7 +14738,7 @@ mod tests {
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}");
@@ -14762,7 +14764,7 @@ mod tests {
fn retry_wrapped_context_window_errors_keep_recovery_guidance() {
let error = ApiError::RetriesExhausted {
attempts: 2,
last_error: Box::new(ApiError::Api {
last_error: Box::new(ApiError::Api(Box::new(ApiErrorDetails {
status: "413".parse().expect("status"),
error_type: Some("invalid_request_error".to_string()),
message: Some("Request is too large for this model's context window.".to_string()),
@@ -14771,7 +14773,7 @@ mod tests {
retryable: false,
suggested_action: None,
retry_after: None,
}),
}))),
};
let rendered = format_user_visible_api_error("session-issue-32", &error);
@@ -2,7 +2,6 @@ use std::io::{self, IsTerminal, Write};
use runtime::{save_user_provider_settings, ConfigLoader, RuntimeProviderConfig};
use serde_json;
const PROVIDERS: &[(&str, &str, &str)] = &[
("1", "Anthropic", "anthropic"),
@@ -3455,7 +3455,7 @@ fn export_json_has_kind_702() {
// On success stdout has kind:export; on failure stderr has type:error.
// Either way, both envelopes must be valid JSON.
let stdout = String::from_utf8_lossy(&output.stdout);
let stderr = String::from_utf8_lossy(&output.stderr)
let _stderr = String::from_utf8_lossy(&output.stderr)
.lines()
.filter(|l| l.starts_with('{'))
.collect::<Vec<_>>()
@@ -3547,8 +3547,8 @@ fn config_parse_error_has_typed_error_kind_and_hint_764() {
!output.status.success(),
"malformed settings.json should cause non-zero exit"
);
let stdout = String::from_utf8_lossy(&output.stdout);
let stderr = String::from_utf8_lossy(&output.stderr);
let _stdout = String::from_utf8_lossy(&output.stdout);
let _stderr = String::from_utf8_lossy(&output.stderr);
let stdout = String::from_utf8_lossy(&output.stdout);
let json_line = stdout
.lines()
@@ -3582,8 +3582,8 @@ fn login_logout_removed_subcommands_have_error_kind_and_hint_765() {
!output.status.success(),
"claw {subcmd} should exit non-zero"
);
let stdout = String::from_utf8_lossy(&output.stdout);
let stderr = String::from_utf8_lossy(&output.stderr);
let _stdout = String::from_utf8_lossy(&output.stdout);
let _stderr = String::from_utf8_lossy(&output.stderr);
let stdout = String::from_utf8_lossy(&output.stdout);
let json_line = stdout
.lines()