Use Claude Code with your ChatGPT, Kimi, Cursor or Grok subscription via a local Anthropic-compatible proxy
Rust
fail checks on clippy warnings
Raine Virta9455b6e4d00f
diff --git a/checkle.toml b/checkle.tomlindex 26b5518..f264356 100644--- a/checkle.toml+++ b/checkle.toml@@ -13,7 +13,7 @@ command = ["--message-format=json","--","-D",- "unused",+ "warnings",][[check]]diff --git a/src/monitor/mock.rs b/src/monitor/mock.rsindex ce2ae3d..45ea722 100644--- a/src/monitor/mock.rs+++ b/src/monitor/mock.rs@@ -402,9 +402,9 @@ fn advance_output_buckets(buckets,Some("57c7c914-ada4-4f40-9672-985f950fbb66".to_string()),current_bucket,- if tick % 2 == 0 { 10 } else { 25 },+ if tick.is_multiple_of(2) { 10 } else { 25 },);- if tick % 4 == 0 {+ if tick.is_multiple_of(4) {record_output_bucket(buckets,Some("terminal-refactor".to_string()),@@ -412,7 +412,7 @@ fn advance_output_buckets(120,);}- if tick % 5 == 0 {+ if tick.is_multiple_of(5) {record_output_bucket(buckets,Some("cursor-session".to_string()),@@ -457,7 +457,7 @@ fn simulated_output_tokens(tick: u64) -> u64 {let pairs = tick / 2;pairs.saturating_mul(35)- .saturating_add(if tick % 2 == 0 { 0 } else { 10 })+ .saturating_add(if tick.is_multiple_of(2) { 0 } else { 10 })}fn add_simulated_requests(@@ -625,6 +625,7 @@ fn simulation_profile(cycle: u64) -> SimulationProfile {PROFILES[index]}+#[allow(clippy::too_many_arguments)]fn active_request(now: SystemTime,instant_now: Instant,@@ -661,6 +662,7 @@ fn active_request(}}+#[allow(clippy::too_many_arguments)]fn completed_request(now: SystemTime,request_id: &str,diff --git a/src/providers/codex/auth/pkce.rs b/src/providers/codex/auth/pkce.rsindex 5a54859..10db2a6 100644--- a/src/providers/codex/auth/pkce.rs+++ b/src/providers/codex/auth/pkce.rs@@ -132,7 +132,7 @@ mod tests {let pkce = generate_pkce();let expected_hash = Sha256::digest(pkce.verifier.as_bytes());let expected_challenge =- base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(&expected_hash);+ base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(expected_hash);assert_eq!(pkce.challenge, expected_challenge);}diff --git a/src/providers/codex/compaction.rs b/src/providers/codex/compaction.rsindex dba2733..8597c85 100644--- a/src/providers/codex/compaction.rs+++ b/src/providers/codex/compaction.rs@@ -161,9 +161,7 @@ pub fn apply_compaction_replay(};let (envelope, conversation) = split_input_envelope(&request.input);- let Some(summary_item) = conversation.first() else {- return None;- };+ let summary_item = conversation.first()?;let Some(text) = message_text(summary_item) else {registry.states.remove(session_id);update_total_bytes(registry);@@ -199,10 +197,10 @@ pub fn abort_compaction_attempt(compact_boundary: bool,request: &ResponsesRequest,) {- if compact_boundary || request_contains_compaction(request) {- if let Some(session_id) = session_id {- clear_compaction(session_id);- }+ if (compact_boundary || request_contains_compaction(request))+ && let Some(session_id) = session_id+ {+ clear_compaction(session_id);}}diff --git a/src/providers/codex/mod.rs b/src/providers/codex/mod.rsindex 7b9f4b8..107628b 100644--- a/src/providers/codex/mod.rs+++ b/src/providers/codex/mod.rs@@ -690,6 +690,7 @@ fn empty_live_stream_response() -> Response {event_stream_response(futures_util::stream::empty::<Result<Bytes, std::io::Error>>())}+#[allow(clippy::too_many_arguments)]fn remaining_live_stream_response(mut upstream_events: websocket::CodexWebSocketEventReceiver,mut translator: LiveStreamTranslator,diff --git a/src/providers/codex/native.rs b/src/providers/codex/native.rsindex a5ff3f6..26e0730 100644--- a/src/providers/codex/native.rs+++ b/src/providers/codex/native.rs@@ -69,6 +69,7 @@ struct NativeResolved {stream: bool,}+#[allow(clippy::result_large_err)]pub fn validate_native_request_model(body: &Value) -> Result<String, Response> {let object = body.as_object().ok_or_else(|| {openai_error(@@ -110,6 +111,7 @@ pub fn validate_native_request_model(body: &Value) -> Result<String, Response> {Ok(requested)}+#[allow(clippy::result_large_err)]fn shape_native_request(body: &mut Value) -> Result<NativeResolved, Response> {let requested = validate_native_request_model(body)?;let object = bodydiff --git a/src/providers/codex/translate/accumulate.rs b/src/providers/codex/translate/accumulate.rsindex 6656c12..f7c3f34 100644--- a/src/providers/codex/translate/accumulate.rs+++ b/src/providers/codex/translate/accumulate.rs@@ -419,6 +419,7 @@ mod tests {}#[test]+ #[allow(clippy::format_in_format_args)]fn accumulate_reasoning_summary_as_thinking_before_text() {let upstream = format!("{}{}{}{}{}{}{}",diff --git a/src/providers/codex/translate/reasoning_signature.rs b/src/providers/codex/translate/reasoning_signature.rsindex 78a88bf..c58b416 100644--- a/src/providers/codex/translate/reasoning_signature.rs+++ b/src/providers/codex/translate/reasoning_signature.rs@@ -73,7 +73,7 @@ pub fn decode_reasoning_signature(signature: &str) -> Option<ReasoningReplay> {}fn encoded_id_len_limit() -> usize {- (MAX_ID_BYTES + 2) / 3 * 4+ MAX_ID_BYTES.div_ceil(3) * 4}fn max_payload_len() -> usize {diff --git a/src/providers/codex/translate/reducer.rs b/src/providers/codex/translate/reducer.rsindex b9b628a..83beec6 100644--- a/src/providers/codex/translate/reducer.rs+++ b/src/providers/codex/translate/reducer.rs@@ -714,8 +714,8 @@ pub fn reduce_upstream_bytes(input: &[u8]) -> Result<Vec<ReducerEvent>, UpstreamNone => continue,};- if let Some(item_val) = item {- if let BlockState::Tool {+ if let Some(item_val) = item+ && let BlockState::Tool {args_accum,name,call_id,@@ -725,32 +725,30 @@ pub fn reduce_upstream_bytes(input: &[u8]) -> Result<Vec<ReducerEvent>, Upstreamindex,..} = &mut state+ {+ if let Some(final_args) = item_val+ .get("arguments")+ .and_then(|v| v.as_str())+ .filter(|s| !s.is_empty()){- if let Some(final_args) = item_val- .get("arguments")- .and_then(|v| v.as_str())- .filter(|s| !s.is_empty())- {- if !args_accum.is_empty() && !*emitted_args {- // Already have accum from deltas - skip- } else if *had_delta {- // Already emitted deltas- } else {- *args_accum = final_args.to_string();- }+ if !args_accum.is_empty() && !*emitted_args {+ // Already have accum from deltas - skip+ } else if *had_delta {+ // Already emitted deltas+ } else {+ *args_accum = final_args.to_string();}+ }- if !args_accum.is_empty() {- let sanitized =- sanitize_read_args(name, args_accum, Some(call_id.as_str()));- *args_accum = sanitized;- if *buffer_until_done || !*emitted_args {- *emitted_args = true;- out.push(ReducerEvent::ToolDelta {- index: *index,- partial_json: args_accum.clone(),- });- }+ if !args_accum.is_empty() {+ let sanitized = sanitize_read_args(name, args_accum, Some(call_id.as_str()));+ *args_accum = sanitized;+ if *buffer_until_done || !*emitted_args {+ *emitted_args = true;+ out.push(ReducerEvent::ToolDelta {+ index: *index,+ partial_json: args_accum.clone(),+ });}}}@@ -1519,6 +1517,7 @@ mod tests {}#[test]+ #[allow(clippy::format_in_format_args)]fn reduce_reasoning_summary_before_text() {let upstream = format!("{}{}{}{}{}{}",@@ -1585,6 +1584,7 @@ mod tests {}#[test]+ #[allow(clippy::format_in_format_args)]fn reduce_empty_reasoning_summary_emits_no_thinking() {let upstream = format!("{}{}{}{}",diff --git a/src/providers/codex/translate/stream.rs b/src/providers/codex/translate/stream.rsindex c3f3076..73596bb 100644--- a/src/providers/codex/translate/stream.rs+++ b/src/providers/codex/translate/stream.rs@@ -647,6 +647,7 @@ mod tests {}#[test]+ #[allow(clippy::format_in_format_args)]fn stream_omits_empty_reasoning_summary() {let upstream = format!("{}{}{}{}{}",diff --git a/src/providers/cursor/client.rs b/src/providers/cursor/client.rsindex bc0c2cd..22f8bda 100644--- a/src/providers/cursor/client.rs+++ b/src/providers/cursor/client.rs@@ -111,7 +111,7 @@ impl CursorHttpClient {.body(body).send().await- .map_err(|e| CursorError::from_reqwest(e))?;+ .map_err(CursorError::from_reqwest)?;let status = resp.status().as_u16();let headers = resp.headers().clone();@@ -206,10 +206,10 @@ fn parse_error_body(body_bytes: &[u8], _headers: &reqwest::header::HeaderMap) ->}// Try plain text error- if let Ok(text) = String::from_utf8(body_bytes.to_vec()) {- if !text.is_empty() {- return Some(text);- }+ if let Ok(text) = String::from_utf8(body_bytes.to_vec())+ && !text.is_empty()+ {+ return Some(text);}None}@@ -230,9 +230,8 @@ pub fn decode_frame_payload(frame: &ConnectFrame,) -> Result<proto::AgentServerMessage, CursorError> {let payload = if frame.flags & FLAG_GZIP != 0 {- let decompressed = super::connect::decode_gzip_frame(&frame.payload)- .map_err(|e| CursorError::internal(format!("gzip decompress: {e}")))?;- decompressed+ super::connect::decode_gzip_frame(&frame.payload)+ .map_err(|e| CursorError::internal(format!("gzip decompress: {e}")))?} else {frame.payload.to_vec()};diff --git a/src/providers/cursor/mod.rs b/src/providers/cursor/mod.rsindex 1df378b..ec75918 100644--- a/src/providers/cursor/mod.rs+++ b/src/providers/cursor/mod.rs@@ -81,29 +81,28 @@ impl Provider for CursorProvider {);}- if let Some(ref session_id) = ctx.session_id {- if let Some(pending) = BridgeRegistry::pending_tool(session_id) {- if let Some(result) = find_tool_result(&body, pending.tool_use_id()) {- let (_result_messages, sse_bytes) =- resume_cursor_tool_bridge(session_id, &message_id, model, result, &pending);- if let Some(monitor) = ctx.monitor.as_ref() {- let (input_tokens, output_tokens) = usage_from_anthropic_sse(&sse_bytes);- monitor.stream_progress(- &ctx.req_id,- sse_bytes.len() as u64,- count_sse_events(&sse_bytes),- input_tokens,- output_tokens,- );- }- let headers = [- (http::header::CONTENT_TYPE, "text/event-stream"),- (http::header::CACHE_CONTROL, "no-cache"),- (http::header::CONNECTION, "keep-alive"),- ];- return (headers, sse_bytes).into_response();- }+ if let Some(ref session_id) = ctx.session_id+ && let Some(pending) = BridgeRegistry::pending_tool(session_id)+ && let Some(result) = find_tool_result(&body, pending.tool_use_id())+ {+ let (_result_messages, sse_bytes) =+ resume_cursor_tool_bridge(session_id, &message_id, model, result, &pending);+ if let Some(monitor) = ctx.monitor.as_ref() {+ let (input_tokens, output_tokens) = usage_from_anthropic_sse(&sse_bytes);+ monitor.stream_progress(+ &ctx.req_id,+ sse_bytes.len() as u64,+ count_sse_events(&sse_bytes),+ input_tokens,+ output_tokens,+ );}+ let headers = [+ (http::header::CONTENT_TYPE, "text/event-stream"),+ (http::header::CACHE_CONTROL, "no-cache"),+ (http::header::CONNECTION, "keep-alive"),+ ];+ return (headers, sse_bytes).into_response();}let auth = match load_cursor_auth() {@@ -141,7 +140,7 @@ impl Provider for CursorProvider {if let Some(monitor) = ctx.monitor.as_ref() {monitor.upstream_started(&ctx.req_id);}- let upstream = match client.run_agent(&token, &prompt, &model, &images).await {+ let upstream = match client.run_agent(&token, &prompt, model, &images).await {Ok(r) => r,Err(e) => {return map_cursor_error_to_response(&e);diff --git a/src/providers/cursor/model.rs b/src/providers/cursor/model.rsindex 69fe9b8..36e056e 100644--- a/src/providers/cursor/model.rs+++ b/src/providers/cursor/model.rs@@ -7,7 +7,6 @@/// `cursor-composer-fast`, `cursor-plan`, `cursor-ask`, `composer-2.5`,/// `composer-2.5-fast` are recognized./// - `cursor-agent:` is also supported for agent mode routing.-pub const CURSOR_LEGACY_MODELS: &[&str] = &["cursor","cursor-agent",diff --git a/src/providers/cursor/request.rs b/src/providers/cursor/request.rsindex a83207e..b9d8fd1 100644--- a/src/providers/cursor/request.rs+++ b/src/providers/cursor/request.rs@@ -30,30 +30,28 @@ pub fn render_cursor_prompt(req: &MessagesRequest) -> String {}// Tools block- if let Some(tools) = req.extra.get("tools").and_then(|v| v.as_array()) {- if !tools.is_empty() {- let tool_lines: Vec<String> = tools- .iter()- .filter_map(|t| {- let name = t.get("name").and_then(|n| n.as_str()).unwrap_or("");- let description = t.get("description").and_then(|d| d.as_str()).unwrap_or("");- let input_schema = t- .get("input_schema")- .cloned()- .unwrap_or(serde_json::Value::Object(Default::default()));- Some(format!(- "{}",- serde_json::json!({- "name": name,- "description": description,- "input_schema": input_schema,- })- ))+ if let Some(tools) = req.extra.get("tools").and_then(|v| v.as_array())+ && !tools.is_empty()+ {+ let tool_lines: Vec<String> = tools+ .iter()+ .map(|t| {+ let name = t.get("name").and_then(|n| n.as_str()).unwrap_or("");+ let description = t.get("description").and_then(|d| d.as_str()).unwrap_or("");+ let input_schema = t+ .get("input_schema")+ .cloned()+ .unwrap_or(serde_json::Value::Object(Default::default()));+ serde_json::json!({+ "name": name,+ "description": description,+ "input_schema": input_schema,})- .collect();- if !tool_lines.is_empty() {- sections.push(format!("<tools>\n{}\n</tools>", tool_lines.join("\n")));- }+ .to_string()+ })+ .collect();+ if !tool_lines.is_empty() {+ sections.push(format!("<tools>\n{}\n</tools>", tool_lines.join("\n")));}}diff --git a/src/providers/cursor/response.rs b/src/providers/cursor/response.rsindex 2bc7258..2584b17 100644--- a/src/providers/cursor/response.rs+++ b/src/providers/cursor/response.rs@@ -64,10 +64,10 @@ pub fn decode_upstream_response(body: &[u8]) -> Result<Vec<CursorStreamEvent>, Cfor frame in &frames {if frame.flags & FLAG_END != 0 {// Check for Connect error in end frame- if !frame.payload.is_empty() {- if let Some(err) = parse_connect_error(&frame.payload) {- return Err(CursorDecodeError::ConnectEnd(err));- }+ if !frame.payload.is_empty()+ && let Some(err) = parse_connect_error(&frame.payload)+ {+ return Err(CursorDecodeError::ConnectEnd(err));}events.push(CursorStreamEvent::End);continue;@@ -141,33 +141,32 @@ fn estimate_input_tokens(_content: &str) -> u64 {fn events_from_message(msg: &AgentServerMessage, events: &mut Vec<CursorStreamEvent>) {// Check for exec_server_message with session info- if let Some(ref exec) = msg.exec_server_message {- if let Some(ref session_id) = exec.notes_session_id {- if !session_id.is_empty() {- events.push(CursorStreamEvent::Session {- session_id: session_id.clone(),- });- }- }+ if let Some(ref exec) = msg.exec_server_message+ && let Some(ref session_id) = exec.notes_session_id+ && !session_id.is_empty()+ {+ events.push(CursorStreamEvent::Session {+ session_id: session_id.clone(),+ });}if let Some(ref update) = msg.interaction_update {// Thinking delta- if let Some(ref td) = update.thinking_delta {- if !td.text.is_empty() {- events.push(CursorStreamEvent::ThinkingDelta {- text: td.text.clone(),- });- }+ if let Some(ref td) = update.thinking_delta+ && !td.text.is_empty()+ {+ events.push(CursorStreamEvent::ThinkingDelta {+ text: td.text.clone(),+ });}// Text delta- if let Some(ref td) = update.text_delta {- if !td.text.is_empty() {- events.push(CursorStreamEvent::TextDelta {- text: td.text.clone(),- });- }+ if let Some(ref td) = update.text_delta+ && !td.text.is_empty()+ {+ events.push(CursorStreamEvent::TextDelta {+ text: td.text.clone(),+ });}// Turn ended (usage + end)diff --git a/src/providers/cursor/sse.rs b/src/providers/cursor/sse.rsindex dccacf8..681b1ff 100644--- a/src/providers/cursor/sse.rs+++ b/src/providers/cursor/sse.rs@@ -523,13 +523,12 @@ mod tests {let mut current_event = String::new();for line in sse.lines() {- if line.starts_with("event: ") {- current_event = line["event: ".len()..].to_string();- } else if line.starts_with("data: ") {- let data_str = &line["data: ".len()..];- if let Ok(data) = serde_json::from_str::<serde_json::Value>(data_str) {- events.push((current_event.clone(), data));- }+ if let Some(event) = line.strip_prefix("event: ") {+ current_event = event.to_string();+ } else if let Some(data_str) = line.strip_prefix("data: ")+ && let Ok(data) = serde_json::from_str::<serde_json::Value>(data_str)+ {+ events.push((current_event.clone(), data));}}diff --git a/src/providers/cursor/tool_bridge.rs b/src/providers/cursor/tool_bridge.rsindex 1082434..3c740ad 100644--- a/src/providers/cursor/tool_bridge.rs+++ b/src/providers/cursor/tool_bridge.rs@@ -375,25 +375,14 @@ pub fn build_read_result_from_native(};let file_size = content.len().to_string();- let read_result = if result.is_error {- serde_json::json!({- "success": {- "path": path,- "content": content,- "totalLines": lines,- "fileSize": file_size- }- })- } else {- serde_json::json!({- "success": {- "path": path,- "content": content,- "totalLines": lines,- "fileSize": file_size- }- })- };+ let read_result = serde_json::json!({+ "success": {+ "path": path,+ "content": content,+ "totalLines": lines,+ "fileSize": file_size+ }+ });let mut map = serde_json::Map::new();map.insert("readResult".into(), read_result);diff --git a/src/providers/cursor/tool_use_xml.rs b/src/providers/cursor/tool_use_xml.rsindex ade797a..88ce9c2 100644--- a/src/providers/cursor/tool_use_xml.rs+++ b/src/providers/cursor/tool_use_xml.rs@@ -171,10 +171,10 @@ impl CursorToolUseXmlParser {};// Check allowed tool names.- if let Some(ref allowed) = self.allowed_tool_names {- if !allowed.contains(name) {- return None;- }+ if let Some(ref allowed) = self.allowed_tool_names+ && !allowed.contains(name)+ {+ return None;}// Parse the JSON body.diff --git a/src/server.rs b/src/server.rsindex cd896b6..d521980 100644--- a/src/server.rs+++ b/src/server.rs@@ -342,6 +342,7 @@ fn native_session_id(headers: &http::HeaderMap) -> Option<String> {})}+#[allow(clippy::result_large_err)]fn parse_native_json_body(body: &[u8]) -> Result<Value, Response> {if body.is_empty() {return Err(openai_error(diff --git a/src/tui.rs b/src/tui.rsindex f0f1c8d..25766c6 100644--- a/src/tui.rs+++ b/src/tui.rs@@ -713,11 +713,9 @@ fn token_sparkline(samples: &[(SystemTime, u64)], width: usize, now: SystemTime)return ' ';}let scaled = value.min(SESSION_SPARKLINE_MAX_TOKENS);- let level = ((u128::from(scaled) * LEVELS.len() as u128- + u128::from(SESSION_SPARKLINE_MAX_TOKENS)- - 1)- / u128::from(SESSION_SPARKLINE_MAX_TOKENS))- .saturating_sub(1) as usize;+ let level = (u128::from(scaled) * LEVELS.len() as u128)+ .div_ceil(u128::from(SESSION_SPARKLINE_MAX_TOKENS))+ .saturating_sub(1) as usize;LEVELS[level]}).collect()diff --git a/tests/cursor_native.rs b/tests/cursor_native.rsindex 0131f19..6479f74 100644--- a/tests/cursor_native.rs+++ b/tests/cursor_native.rs@@ -256,6 +256,7 @@ fn cursor_error_display_works() {}#[tokio::test(flavor = "current_thread")]+#[allow(clippy::await_holding_lock)]async fn cursor_client_sends_connect_proto_headers_and_run_request_frame() {use axum::{Router, routing::post};use claude_code_proxy::providers::cursor::client::CursorHttpClient;@@ -677,6 +678,7 @@ fn registry_provider_for_legacy_cursor_model() {// ---------------------------------------------------------------------------#[tokio::test]+#[allow(clippy::await_holding_lock)]async fn cursor_provider_streams_text_and_usage_from_mock_upstream() {use axum::{Router, routing::post};use claude_code_proxy::providers::cursor::connect::encode_connect_frame;@@ -798,6 +800,7 @@ async fn cursor_provider_streams_text_and_usage_from_mock_upstream() {// ---------------------------------------------------------------------------#[tokio::test]+#[allow(clippy::await_holding_lock)]async fn cursor_provider_handle_messages_returns_anthropic_json() {use axum::{Router, routing::post};use claude_code_proxy::providers::cursor::connect::encode_connect_frame;@@ -896,6 +899,7 @@ async fn cursor_provider_handle_messages_returns_anthropic_json() {}#[tokio::test(flavor = "current_thread")]+#[allow(clippy::await_holding_lock)]async fn cursor_proxy_http_path_reaches_mock_cursor_upstream() {use axum::{Router, routing::post};use claude_code_proxy::providers::cursor::connect::{@@ -1525,13 +1529,12 @@ fn parse_sse_events(sse: &str) -> Vec<(String, serde_json::Value)> {let mut current_event = String::new();for line in sse.lines() {- if line.starts_with("event: ") {- current_event = line["event: ".len()..].to_string();- } else if line.starts_with("data: ") {- let data_str = &line["data: ".len()..];- if let Ok(data) = serde_json::from_str::<serde_json::Value>(data_str) {- events.push((current_event.clone(), data));- }+ if let Some(event) = line.strip_prefix("event: ") {+ current_event = event.to_string();+ } else if let Some(data_str) = line.strip_prefix("data: ")+ && let Ok(data) = serde_json::from_str::<serde_json::Value>(data_str)+ {+ events.push((current_event.clone(), data));}}diff --git a/tests/smoke_cutover.rs b/tests/smoke_cutover.rsindex fcd8ff6..d0a6aeb 100644--- a/tests/smoke_cutover.rs+++ b/tests/smoke_cutover.rs@@ -566,6 +566,7 @@ async fn smoke_healthz_returns_ok() {}#[tokio::test]+#[allow(clippy::await_holding_lock)]async fn smoke_codex_model_routes_to_real_provider() {let _guard = env_lock();let response = call_messages("gpt-5.5").await;