Merge pull request gi-dellav#119 from xavierforge/chore/fix-clippy-warnings

chore(lint): resolve clippy warnings across default and feature builds

Author: gi-dellav

src/agent/runner.rs

@@ -463,7 +463,7 @@ fn format_tool_args_summary(args_json: &serde_json::Value) -> String {
                     } else {
                         s
                     };
-                    return format!("{}", truncated);
+                    return truncated.to_string();
                 }
             }
             String::new()

src/config/load.rs

@@ -129,29 +129,28 @@ pub fn save_quick_model(
 }
 
 fn rich_default_config() -> Config {
-    let mut cfg = Config::default();
-    cfg.quick_models = Some(default_quick_models());
-    cfg.provider = Some(CompactString::new("openrouter"));
-    cfg.model = Some(CompactString::new("deepseek/deepseek-v4-pro"));
-    cfg.max_tokens = Some(16384);
-    cfg.compact_enabled = Some(true);
-    cfg.max_text_file_size = Some(1_048_576);
-    cfg.edit_system = Some(EditSystem::Similarity);
-    cfg.default_permission_mode = Some("standard".to_string());
-    cfg.default_prompt = Some(CompactString::new("code"));
-    cfg.show_tool_details = None;
-    #[cfg(feature = "subagents")]
-    {
-        cfg.subagent_max_read_lines = Some(2000);
-        cfg.subagent_max_grep_results = Some(200);
-        cfg.subagent_max_find_results = Some(200);
-    }
-    cfg.chain = Some(crate::config::types::ChainConfig::default());
-    #[cfg(feature = "advisor")]
-    {
-        cfg.advisor = Some(crate::config::types::AdvisorConfig::default());
+    Config {
+        quick_models: Some(default_quick_models()),
+        provider: Some(CompactString::new("openrouter")),
+        model: Some(CompactString::new("deepseek/deepseek-v4-pro")),
+        max_tokens: Some(16384),
+        compact_enabled: Some(true),
+        max_text_file_size: Some(1_048_576),
+        edit_system: Some(EditSystem::Similarity),
+        default_permission_mode: Some("standard".to_string()),
+        default_prompt: Some(CompactString::new("code")),
+        show_tool_details: None,
+        chain: Some(crate::config::types::ChainConfig::default()),
+        #[cfg(feature = "subagents")]
+        subagent_max_read_lines: Some(2000),
+        #[cfg(feature = "subagents")]
+        subagent_max_grep_results: Some(200),
+        #[cfg(feature = "subagents")]
+        subagent_max_find_results: Some(200),
+        #[cfg(feature = "advisor")]
+        advisor: Some(crate::config::types::AdvisorConfig::default()),
+        ..Default::default()
     }
-    cfg
 }
 
 pub fn load() -> (Config, bool) {

src/config/mod.rs

@@ -213,10 +213,10 @@ impl Config {
             return rt;
         }
         for qmc in qm.values() {
-            if qmc.model.as_str() == model_id {
-                if let Some(rt) = qmc.reserve_tokens {
-                    return rt;
-                }
+            if qmc.model.as_str() == model_id
+                && let Some(rt) = qmc.reserve_tokens
+            {
+                return rt;
             }
         }
         8_192
@@ -238,10 +238,10 @@ impl Config {
             return Some(temp.clamp(0.0, 2.0));
         }
         for qmc in qm.values() {
-            if qmc.model.as_str() == model_id {
-                if let Some(temp) = qmc.temperature {
-                    return Some(temp.clamp(0.0, 2.0));
-                }
+            if qmc.model.as_str() == model_id
+                && let Some(temp) = qmc.temperature
+            {
+                return Some(temp.clamp(0.0, 2.0));
             }
         }
         self.temperature.map(|t| t.clamp(0.0, 2.0))

src/extras/memory/mod.rs

@@ -161,7 +161,7 @@ impl Mem {
         }
     }
 
-    fn truncate_to_bytes<'a>(s: &'a str, max: usize) -> &'a str {
+    fn truncate_to_bytes(s: &str, max: usize) -> &str {
         if s.len() <= max {
             return s;
         }

src/extras/subagents/builder.rs

@@ -4,6 +4,7 @@ use crate::provider::{AnyAgent, AnyModel, OpenAiAgent, OpenAiModel};
 use rig::agent::{Agent, AgentBuilder};
 use rig::completion::CompletionModel;
 
+#[allow(clippy::too_many_arguments)]
 fn build_explore_agent_inner<M: CompletionModel + 'static>(
     model: M,
     max_turns: usize,

src/main.rs

@@ -480,12 +480,12 @@ async fn main() -> anyhow::Result<()> {
                 content.clone()
             };
 
-            #[allow(unused_mut)]
-            let mut caps: Vec<&str> = Vec::new();
-            #[cfg(feature = "memory")]
-                caps.push("- **Memory**: persistent memory across sessions (memory_read, memory_write, memory_search)");
-            #[cfg(feature = "subagents")]
-                caps.push("- **Subagents**: delegate specific multi-step investigations to parallel subagents via the `task` tool");
+            let caps: &[&str] = &[
+                #[cfg(feature = "memory")]
+                "- **Memory**: persistent memory across sessions (memory_read, memory_write, memory_search)",
+                #[cfg(feature = "subagents")]
+                "- **Subagents**: delegate specific multi-step investigations to parallel subagents via the `task` tool",
+            ];
 
             if !caps.is_empty() {
                 prompt_text.push_str("\n\n## Available Capabilities\n\n");
@@ -508,12 +508,12 @@ async fn main() -> anyhow::Result<()> {
                 content.clone()
             };
 
-            #[allow(unused_mut)]
-            let mut caps: Vec<&str> = Vec::new();
-            #[cfg(feature = "memory")]
-                caps.push("- **Memory**: persistent memory across sessions (memory_read, memory_write, memory_search)");
-            #[cfg(feature = "subagents")]
-                caps.push("- **Subagents**: delegate specific multi-step investigations to parallel subagents via the `task` tool");
+            let caps: &[&str] = &[
+                #[cfg(feature = "memory")]
+                "- **Memory**: persistent memory across sessions (memory_read, memory_write, memory_search)",
+                #[cfg(feature = "subagents")]
+                "- **Subagents**: delegate specific multi-step investigations to parallel subagents via the `task` tool",
+            ];
 
             if !caps.is_empty() {
                 prompt_text.push_str("\n\n## Available Capabilities\n\n");

src/permission/checker.rs

@@ -248,9 +248,7 @@ impl PermissionChecker {
                 }
             }),
             SecurityMode::PlanWrite => base.unwrap_or_else(|| {
-                if self.is_read_tool(tool) {
-                    Action::Allow
-                } else if matches!(tool, "write" | "edit") && is_plan_file(abs_path) {
+                if self.is_read_tool(tool) || (matches!(tool, "write" | "edit") && is_plan_file(abs_path)) {
                     Action::Allow
                 } else {
                     Action::Deny

src/provider.rs

@@ -882,6 +882,7 @@ pub async fn build_agent(
 }
 
 /// Builds the isolated, tool-less `/btw` agent for the active provider.
+#[allow(clippy::too_many_arguments)]
 pub fn build_btw_agent(
     model: AnyModel,
     cli: &Cli,

src/session/storage.rs

@@ -88,7 +88,7 @@ pub fn find_recent_sessions(limit: usize) -> anyhow::Result<Vec<Session>> {
         .collect();
 
     // Sort newest first
-    entries.sort_by(|a, b| b.0.cmp(&a.0));
+    entries.sort_by_key(|b| std::cmp::Reverse(b.0));
 
     let mut sessions: Vec<Session> = Vec::new();
     for (_, path) in entries.iter().take(limit) {

src/ui/mod.rs

@@ -232,6 +232,7 @@ pub(crate) fn classify_submission(is_running: bool, text: &str) -> SubmitAction
 }
 
 #[cfg(feature = "git-worktree")]
+#[allow(clippy::too_many_arguments)]
 async fn spawn_merge_agent(
     branch: &str,
     target: &str,
@@ -1307,10 +1308,10 @@ pub async fn run_interactive(
                                         "chain declined — won't ask again this session",
                                         C_AGENT,
                                     )?;
-                                    if let Some(ref name) = context.current_prompt_name {
-                                        if !context.chain_declined.contains(name) {
-                                            context.chain_declined.push(name.clone());
-                                        }
+                                    if let Some(ref name) = context.current_prompt_name
+                                        && !context.chain_declined.contains(name)
+                                    {
+                                        context.chain_declined.push(name.clone());
                                     }
                                     refresh_display(&mut renderer, &mut input, session, is_running, loop_label.as_deref(), context.current_prompt_name.as_deref(), perm_mode().as_deref(), chain_label_msg.as_deref(), btw_total_cost, btw_total_in, btw_total_out)?;
                                     continue;
@@ -1319,7 +1320,7 @@ pub async fn run_interactive(
                                     renderer.chain_but_mode = true;
                                     renderer.chain_prompt = None;
                                     input.clear_buffer();
-                                    chain_label_msg = chain_pending.map(|p| p.chain_label().to_string().into());
+                                    chain_label_msg = chain_pending.map(|p| p.chain_label().to_string());
                                     refresh_display(&mut renderer, &mut input, session, is_running, loop_label.as_deref(), context.current_prompt_name.as_deref(), perm_mode().as_deref(), chain_label_msg.as_deref(), btw_total_cost, btw_total_in, btw_total_out)?;
                                     continue;
                                 }
@@ -2101,30 +2102,30 @@ pub async fn run_interactive(
         }
 
         #[cfg(feature = "advisor")]
-        if let Some(ref mut rx) = handoff_rx {
-            if let Ok(handoff_req) = rx.try_recv() {
-                handle_human_handoff(
-                    handoff_req,
-                    &mut renderer,
-                    &mut user_rx,
-                    &mut agent_line_started,
-                    &mut was_reasoning,
-                )
-                .await?;
-                refresh_display(
-                    &mut renderer,
-                    &mut input,
-                    session,
-                    is_running,
-                    loop_label.as_deref(),
-                    context.current_prompt_name.as_deref(),
-                    perm_mode().as_deref(),
-                    chain_label_msg.as_deref(),
-                    btw_total_cost,
-                    btw_total_in,
-                    btw_total_out,
-                )?;
-            }
+        if let Some(ref mut rx) = handoff_rx
+            && let Ok(handoff_req) = rx.try_recv()
+        {
+            handle_human_handoff(
+                handoff_req,
+                &mut renderer,
+                &mut user_rx,
+                &mut agent_line_started,
+                &mut was_reasoning,
+            )
+            .await?;
+            refresh_display(
+                &mut renderer,
+                &mut input,
+                session,
+                is_running,
+                loop_label.as_deref(),
+                context.current_prompt_name.as_deref(),
+                perm_mode().as_deref(),
+                chain_label_msg.as_deref(),
+                btw_total_cost,
+                btw_total_in,
+                btw_total_out,
+            )?;
         }
     }