chore: clear 53 pre-existing clippy warnings to unblock -D warnings

Slice 8 (verification gate). After this commit
`cargo clippy --workspace --all-targets -- -D warnings`
passes for the first time in this repo.

Mechanical fixes via `cargo clippy --fix` (28 warnings cleared):
  redundant closures, expression auto-borrow, `if` collapse,
  `for` loop conversion, derivable `Default` impl, `Default`
  on StreamAccumulator, casting to same type, redundant
  `is_some` patterns, etc.

Hand-applied fixes (25 warnings cleared):
  * core/src/lib.rs:
      - Replace `let mut cfg = Config::default(); cfg.field = ...`
        in 3 tests with struct-update syntax (matches AGENTS.md
        rule: no field-assignment-after-default).
      - `sessions.sort_by(...)` → `sessions.sort_by_key(...)`.
      - Collapse two identical `if` branches into a single
        condition in the AcceptEdits PermissionMode arm.
      - Same in the pricing model_router for `-free` / `free/` /
        `is_free_upstream_model` paths.
  * core/src/system_prompt.rs:
      - Rename `OutputStyle::from_str` → `from_label` so it no
        longer collides with the std `FromStr` trait method
        (its infallible "fallback to Default" semantics would
        violate the FromStr contract).
      - Replace `let mut parts = Vec::new(); parts.push(...);`
        with a single `vec![...]` literal.
  * cli/src/main.rs:
      - Reformat the `/coven-code models` doc list to drop the
        overindentation clippy now warns about (4 entries).
      - `loop { match try_recv() { Ok(t) => ..., Err(_) => break } }`
        → `while let Ok(t) = try_recv() { ... }`.
  * tui/src/message_copy.rs:
      - Replace `if line.starts_with("```") { ... line[3..] ... }`
        with `if let Some(rest) = line.strip_prefix("```")`.
  * query/src/lib.rs:
      - Collapse `if let ContentBlock::ToolUse {...}` into the
        outer `match` arm pattern.
  * query/src/lib.rs and cli/src/main.rs:
      - `#[allow(clippy::too_many_arguments)]` with a comment
        justifying it on `run_query_loop` (9 args) and
        `run_interactive` (12 args). Both have distinct
        domain-level inputs that a config struct would just
        re-shuffle without improving readability.

Workspace tests still 1525 passing, 0 failing.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: BunsDev

src-rust/crates/api/src/lib.rs

@@ -394,20 +394,15 @@ pub mod client {
     use super::*;
 
     /// Provider selection for API calls.
-    #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
     pub enum Provider {
         /// Use Anthropic's API
+        #[default]
         Anthropic,
         /// Use OpenAI Codex via OAuth
         Codex,
     }
 
-    impl Default for Provider {
-        fn default() -> Self {
-            Provider::Anthropic
-        }
-    }
-
     /// Configuration for the HTTP client.
     #[derive(Debug, Clone)]
     pub struct ClientConfig {
@@ -1118,6 +1113,12 @@ enum PartialBlock {
     },
 }
 
+impl Default for StreamAccumulator {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl StreamAccumulator {
     pub fn new() -> Self {
         Self {

src-rust/crates/cli/src/main.rs

@@ -1028,7 +1028,7 @@ async fn main() -> anyhow::Result<()> {
     // but we guard with a std::sync::OnceLock internally).
     {
         static SWARM_INIT: std::sync::OnceLock<()> = std::sync::OnceLock::new();
-        SWARM_INIT.get_or_init(|| claurst_query::init_team_swarm_runner());
+        SWARM_INIT.get_or_init(claurst_query::init_team_swarm_runner);
     }
 
     // Build the full tool list: built-ins from cc-tools plus AgentTool from cc-query
@@ -1266,14 +1266,14 @@ fn models_dev_cache_path() -> PathBuf {
 /// Implementation of the `coven-code models` subcommand.
 ///
 /// Flags:
-///   * `--refresh`   — force-fetch from models.dev (ignoring the 5-minute
-///                     freshness window), then list.
-///   * `--verbose`   — also print release date, status, modalities,
-///                     cache pricing, and capability flags.
-///   * `--json`      — emit the registry as a JSON object keyed by
-///                     `provider/model` (suitable for piping into `jq`).
-///   * `<provider>`  — first non-flag arg filters by provider id
-///                     (e.g. `coven-code models openai`).
+/// * `--refresh`   — force-fetch from models.dev (ignoring the 5-minute
+///   freshness window), then list.
+/// * `--verbose`   — also print release date, status, modalities,
+///   cache pricing, and capability flags.
+/// * `--json`      — emit the registry as a JSON object keyed by
+///   `provider/model` (suitable for piping into `jq`).
+/// * `<provider>`  — first non-flag arg filters by provider id
+///   (e.g. `coven-code models openai`).
 async fn run_models_command(args: &[String]) -> anyhow::Result<()> {
     let mut refresh = false;
     let mut verbose = false;
@@ -1324,14 +1324,14 @@ async fn run_models_command(args: &[String]) -> anyhow::Result<()> {
     // Stable order: provider id, then by descending release_date so newest
     // models appear first.
     entries.sort_by(|a, b| {
-        (&*a.info.provider_id)
+        (*a.info.provider_id)
             .cmp(&*b.info.provider_id)
             .then_with(|| {
                 let rd_a = a.release_date.as_deref().unwrap_or("");
                 let rd_b = b.release_date.as_deref().unwrap_or("");
                 rd_b.cmp(rd_a)
             })
-            .then_with(|| (&*a.info.id).cmp(&*b.info.id))
+            .then_with(|| (*a.info.id).cmp(&*b.info.id))
     });
 
     if as_json {
@@ -2037,6 +2037,13 @@ fn permission_request_from_core(
     }
 }
 
+// Allowed: this is the main interactive-mode bootstrap. Its inputs are all
+// distinct, separately-constructed services (config, settings, HTTP client,
+// tool registry, tool execution context, query loop knobs, etc.) and
+// bundling them behind a struct would force every test and CLI mode to
+// construct that struct just to call this function. The count is a feature
+// of how the TUI is wired together, not a code-smell.
+#[allow(clippy::too_many_arguments)]
 async fn run_interactive(
     config: Config,
     settings: claurst_core::config::Settings,
@@ -3270,14 +3277,8 @@ async fn run_interactive(
                                             }
                                             Some('p') => {
                                                 let mut settings =
-                                                    match claurst_core::config::Settings::load_sync(
-                                                    ) {
-                                                        Ok(s) => s,
-                                                        Err(_) => {
-                                                            claurst_core::config::Settings::default(
-                                                            )
-                                                        }
-                                                    };
+                                                    claurst_core::config::Settings::load_sync(
+                                                    ).unwrap_or_default();
                                                 if let Some(path) = selected_path.as_deref() {
                                                     let pattern = format!("{}*", path);
                                                     let _ = manager.add_persistent_allow_path(
@@ -3342,13 +3343,13 @@ async fn run_interactive(
                         session.updated_at = chrono::Utc::now();
                     }
                 }
-                Event::Paste(data) => {
+                Event::Paste(data)
                     // Cmd+V paste on macOS / Ctrl+Shift+V on Linux (via bracketed paste)
                     if !app.is_streaming
                         && app.permission_request.is_none()
                         && !app.history_search_overlay.visible
                         && app.history_search.is_none()
-                    {
+                    => {
                         if app.key_input_dialog.visible {
                             // Paste into API key input dialog
                             for ch in data.chars() {
@@ -3359,7 +3360,6 @@ async fn run_interactive(
                             app.prompt_input.paste(&data);
                         }
                     }
-                }
                 Event::Mouse(mouse) => {
                     app.handle_mouse_event(mouse);
                 }
@@ -3657,14 +3657,13 @@ async fn run_interactive(
                                         Ok(msgs) if !msgs.is_empty() => {
                                             for msg in &msgs {
                                                 since_id = Some(msg.id.clone());
-                                                if msg.role == "user" {
-                                                    if poll_tx
+                                                if msg.role == "user"
+                                                    && poll_tx
                                                         .send(msg.content.clone())
                                                         .await
                                                         .is_err()
-                                                    {
-                                                        return;
-                                                    }
+                                                {
+                                                    return;
                                                 }
                                             }
                                         }
@@ -3854,13 +3853,8 @@ async fn run_interactive(
 
         // Drain CLAUDE_STATUS_COMMAND results (most recent wins)
         if status_cmd_str.is_some() {
-            loop {
-                match status_cmd_rx.try_recv() {
-                    Ok(text) => {
-                        app.status_line_override = if text.is_empty() { None } else { Some(text) };
-                    }
-                    Err(_) => break,
-                }
+            while let Ok(text) = status_cmd_rx.try_recv() {
+                app.status_line_override = if text.is_empty() { None } else { Some(text) };
             }
         }
 

src-rust/crates/core/src/lib.rs

@@ -790,21 +790,17 @@ pub mod config {
     /// Budget allocation strategy between manager and executor agents.
     #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
     #[serde(tag = "type", rename_all = "snake_case")]
+    #[derive(Default)]
     pub enum BudgetSplitPolicy {
         /// Shared pool — no split (default).
+        #[default]
         SharedPool,
         /// Manager gets manager_pct% of total budget.
         Percentage { manager_pct: u8 },
         /// Hard USD caps per role.
         FixedCaps { manager_usd: f64, executor_usd: f64 },
     }
 
-    impl Default for BudgetSplitPolicy {
-        fn default() -> Self {
-            BudgetSplitPolicy::SharedPool
-        }
-    }
-
     /// Configuration for manager-executor agent architecture.
     #[derive(Debug, Clone, Serialize, Deserialize)]
     pub struct ManagedAgentConfig {
@@ -1236,7 +1232,7 @@ pub mod config {
     }
 
     /// Configuration for a file formatter tool.
-    #[derive(Debug, Clone, Serialize, Deserialize)]
+    #[derive(Debug, Clone, Serialize, Deserialize, Default)]
     pub struct FormatterConfig {
         /// Command to run, e.g. `["prettier", "--write"]`.
         pub command: Vec<String>,
@@ -1247,16 +1243,6 @@ pub mod config {
         pub disabled: bool,
     }
 
-    impl Default for FormatterConfig {
-        fn default() -> Self {
-            Self {
-                command: Vec::new(),
-                extensions: Vec::new(),
-                disabled: false,
-            }
-        }
-    }
-
     #[derive(Debug, Clone, Serialize, Deserialize, Default)]
     pub struct ProjectSettings {
         #[serde(default)]
@@ -1374,7 +1360,7 @@ pub mod config {
         pub fn effective_output_style(&self) -> crate::system_prompt::OutputStyle {
             self.output_style
                 .as_deref()
-                .map(crate::system_prompt::OutputStyle::from_str)
+                .map(crate::system_prompt::OutputStyle::from_label)
                 .unwrap_or_default()
         }
 
@@ -2831,9 +2817,7 @@ pub mod permissions {
             match self.mode {
                 PermissionMode::BypassPermissions => PermissionDecision::Allow,
                 PermissionMode::AcceptEdits => {
-                    if request.tool_name == "Edit" {
-                        PermissionDecision::Allow
-                    } else if request.is_read_only {
+                    if request.tool_name == "Edit" || request.is_read_only {
                         PermissionDecision::Allow
                     } else {
                         PermissionDecision::Deny
@@ -3373,25 +3357,20 @@ pub mod history {
         }
 
         let mut sessions = vec![];
-        match tokio::fs::read_dir(&dir).await {
-            Ok(mut entries) => {
-                while let Ok(Some(entry)) = entries.next_entry().await {
-                    let path = entry.path();
-                    if path.extension().and_then(|s| s.to_str()) == Some("json") {
-                        if let Ok(content) = tokio::fs::read_to_string(&path).await {
-                            if let Ok(session) =
-                                serde_json::from_str::<ConversationSession>(&content)
-                            {
-                                sessions.push(session);
-                            }
+        if let Ok(mut entries) = tokio::fs::read_dir(&dir).await {
+            while let Ok(Some(entry)) = entries.next_entry().await {
+                let path = entry.path();
+                if path.extension().and_then(|s| s.to_str()) == Some("json") {
+                    if let Ok(content) = tokio::fs::read_to_string(&path).await {
+                        if let Ok(session) = serde_json::from_str::<ConversationSession>(&content) {
+                            sessions.push(session);
                         }
                     }
                 }
             }
-            Err(_) => {}
         }
 
-        sessions.sort_by(|a, b| b.updated_at.cmp(&a.updated_at));
+        sessions.sort_by_key(|s| std::cmp::Reverse(s.updated_at));
         sessions
     }
 
@@ -3582,9 +3561,10 @@ pub mod cost {
         /// Pick pricing based on model name substring matching.
         pub fn for_model(model: &str) -> Self {
             // Check for free models first (those with "-free" suffix, "free/" prefix, or upstream-prefixed free model)
-            if model.ends_with("-free") || model.starts_with("free/") {
-                Self::FREE
-            } else if is_free_upstream_model(model) {
+            if model.ends_with("-free")
+                || model.starts_with("free/")
+                || is_free_upstream_model(model)
+            {
                 Self::FREE
             } else if model.contains("opus") {
                 Self::OPUS
@@ -4003,7 +3983,7 @@ pub mod oauth {
 
             let profile = AccountProfile {
                 id: id.clone(),
-                label: label.map(|l| slugify_profile_id(l)),
+                label: label.map(slugify_profile_id),
                 email: self.email.clone(),
                 account_id: self.account_uuid.clone(),
                 organization_uuid: self.organization_uuid.clone(),
@@ -4403,8 +4383,10 @@ mod tests {
 
     #[test]
     fn test_config_effective_model_override() {
-        let mut cfg = crate::config::Config::default();
-        cfg.model = Some("claude-haiku-4-5-20251001".to_string());
+        let cfg = crate::config::Config {
+            model: Some("claude-haiku-4-5-20251001".to_string()),
+            ..crate::config::Config::default()
+        };
         assert_eq!(cfg.effective_model(), "claude-haiku-4-5-20251001");
     }
 
@@ -4419,8 +4401,10 @@ mod tests {
 
     #[test]
     fn test_config_effective_max_tokens_override() {
-        let mut cfg = crate::config::Config::default();
-        cfg.max_tokens = Some(8192);
+        let cfg = crate::config::Config {
+            max_tokens: Some(8192),
+            ..crate::config::Config::default()
+        };
         assert_eq!(cfg.effective_max_tokens(), 8192);
     }
 
@@ -4431,8 +4415,10 @@ mod tests {
         let orig = std::env::var("ANTHROPIC_API_KEY").ok();
         std::env::remove_var("ANTHROPIC_API_KEY");
 
-        let mut cfg = crate::config::Config::default();
-        cfg.api_key = Some("sk-ant-config-key".to_string());
+        let cfg = crate::config::Config {
+            api_key: Some("sk-ant-config-key".to_string()),
+            ..crate::config::Config::default()
+        };
         assert_eq!(cfg.resolve_api_key(), Some("sk-ant-config-key".to_string()));
 
         if let Some(k) = orig {

src-rust/crates/core/src/system_prompt.rs

@@ -110,7 +110,13 @@ impl OutputStyle {
     }
 
     /// Parse from a string (case-insensitive).
-    pub fn from_str(s: &str) -> Self {
+    ///
+    /// Named `from_label` (not `from_str`) so clippy doesn't confuse this
+    /// with the `std::str::FromStr` trait method: this parser is infallible
+    /// and falls back to `Self::Default` for unknown inputs, which would be
+    /// a contract violation if it implemented `FromStr` (where the
+    /// associated `Err` type is supposed to surface parse failures).
+    pub fn from_label(s: &str) -> Self {
         match s.to_lowercase().as_str() {
             "explanatory" => Self::Explanatory,
             "learning" => Self::Learning,
@@ -250,20 +256,17 @@ pub fn build_system_prompt(opts: &SystemPromptOptions) -> String {
         SystemPromptPrefix::detect(opts.is_non_interactive, opts.has_append_system_prompt)
     });
 
-    let mut parts: Vec<String> = Vec::new();
-
     // ------------------------------------------------------------------ //
     // CACHEABLE sections (before the dynamic boundary)                   //
     // ------------------------------------------------------------------ //
-
-    // 1. Attribution header
-    parts.push(prefix.attribution_text().to_string());
-
-    // 2. Core capabilities
-    parts.push(CORE_CAPABILITIES.to_string());
-
-    // 3. Tool use guidelines
-    parts.push(TOOL_USE_GUIDELINES.to_string());
+    let mut parts: Vec<String> = vec![
+        // 1. Attribution header
+        prefix.attribution_text().to_string(),
+        // 2. Core capabilities
+        CORE_CAPABILITIES.to_string(),
+        // 3. Tool use guidelines
+        TOOL_USE_GUIDELINES.to_string(),
+    ];
 
     // 4. Executing actions with care
     parts.push(ACTIONS_SECTION.to_string());
@@ -634,9 +637,9 @@ mod tests {
 
     #[test]
     fn test_output_style_from_str() {
-        assert_eq!(OutputStyle::from_str("concise"), OutputStyle::Concise);
-        assert_eq!(OutputStyle::from_str("FORMAL"), OutputStyle::Formal);
-        assert_eq!(OutputStyle::from_str("unknown"), OutputStyle::Default);
+        assert_eq!(OutputStyle::from_label("concise"), OutputStyle::Concise);
+        assert_eq!(OutputStyle::from_label("FORMAL"), OutputStyle::Formal);
+        assert_eq!(OutputStyle::from_label("unknown"), OutputStyle::Default);
     }
 
     #[test]