fix: clippy fixes and add missing TaskStartedEvent import

Author: Factory Bot

cortex-cli/src/main.rs

@@ -822,19 +822,19 @@ async fn list_sessions(
             }
 
             // Parse session timestamp for date filtering
-            if since_date.is_some() || until_date.is_some() {
-                if let Ok(session_time) = DateTime::parse_from_rfc3339(&s.timestamp) {
-                    let session_utc = session_time.with_timezone(&Utc);
-                    if let Some(ref since) = since_date {
-                        if session_utc < *since {
-                            return false;
-                        }
-                    }
-                    if let Some(ref until) = until_date {
-                        if session_utc > *until {
-                            return false;
-                        }
-                    }
+            if (since_date.is_some() || until_date.is_some())
+                && let Ok(session_time) = DateTime::parse_from_rfc3339(&s.timestamp)
+            {
+                let session_utc = session_time.with_timezone(&Utc);
+                if let Some(ref since) = since_date
+                    && session_utc < *since
+                {
+                    return false;
+                }
+                if let Some(ref until) = until_date
+                    && session_utc > *until
+                {
+                    return false;
                 }
             }
 

cortex-cli/src/run_cmd.rs

@@ -764,18 +764,18 @@ impl RunCli {
         if error_occurred {
             // If it was a new session and an error occurred, we should probably clean up
             // the history entry so it doesn't pollute the logs with failed runs.
-            if let SessionMode::New { .. } = &session_mode {
-                if let Ok(conv_id) = ConversationId::from_string(&session_id) {
-                    let rollout_path =
-                        cortex_engine::rollout::get_rollout_path(&config.cortex_home, &conv_id);
-                    if rollout_path.exists() {
-                        if let Err(e) = std::fs::remove_file(&rollout_path) {
-                            if self.verbose {
-                                eprintln!("Failed to remove failed session history: {}", e);
-                            }
-                        } else if self.verbose {
-                            eprintln!("Removed failed session history: {}", session_id);
+            if let SessionMode::New { .. } = &session_mode
+                && let Ok(conv_id) = ConversationId::from_string(&session_id)
+            {
+                let rollout_path =
+                    cortex_engine::rollout::get_rollout_path(&config.cortex_home, &conv_id);
+                if rollout_path.exists() {
+                    if let Err(e) = std::fs::remove_file(&rollout_path) {
+                        if self.verbose {
+                            eprintln!("Failed to remove failed session history: {}", e);
                         }
+                    } else if self.verbose {
+                        eprintln!("Removed failed session history: {}", session_id);
                     }
                 }
             }

cortex-cli/src/uninstall_cmd.rs

@@ -558,7 +558,7 @@ fn collect_windows_items() -> Result<Vec<RemovalItem>> {
 }
 
 /// Collect shell completion file locations.
-fn collect_completion_items(home_dir: &Path) -> Result<Vec<RemovalItem>> {
+fn collect_completion_items(_home_dir: &Path) -> Result<Vec<RemovalItem>> {
     let mut items = Vec::new();
 
     #[cfg(not(target_os = "windows"))]
@@ -827,7 +827,7 @@ fn validate_path_safety(path: &Path) -> Result<()> {
 
 /// Clean up shell completion references from rc files.
 fn clean_shell_completions() -> Result<()> {
-    let home_dir = dirs::home_dir().context("Could not determine home directory")?;
+    let _home_dir = dirs::home_dir().context("Could not determine home directory")?;
 
     #[cfg(not(target_os = "windows"))]
     {

cortex-common/src/sanitize.rs

@@ -1,7 +1,5 @@
 //! String and path sanitization utilities
 
-use std::path::{Path, PathBuf};
-
 /// Sanitize a filename by removing/replacing unsafe characters
 pub fn sanitize_filename(filename: &str) -> String {
     filename

cortex-engine/src/auth_manager.rs

@@ -36,7 +36,7 @@ use secrecy::{ExposeSecret, SecretString};
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 use tokio::sync::RwLock;
-use tracing::{debug, error, info, trace, warn};
+use tracing::{debug, info, trace, warn};
 
 /// Default service name for keyring entries.
 const KEYRING_SERVICE: &str = "Cortex-cli";
@@ -253,23 +253,14 @@ impl AuthManagerConfig {
 }
 
 /// Cached authentication state.
-#[derive(Debug)]
+#[derive(Debug, Default)]
 struct CachedAuth {
     /// The cached token.
     token: Option<AuthToken>,
     /// Time of last refresh.
     last_refresh: Option<Instant>,
 }
 
-impl Default for CachedAuth {
-    fn default() -> Self {
-        Self {
-            token: None,
-            last_refresh: None,
-        }
-    }
-}
-
 /// Centralized authentication manager providing a single source of truth
 /// for authentication state across the Cortex CLI application.
 ///
@@ -328,11 +319,12 @@ impl AuthManager {
         // First check cache
         {
             let cache = self.cache.read().await;
-            if let Some(ref token) = cache.token {
-                if !token.is_expired() && !token.expires_soon(self.config.refresh_threshold_secs) {
-                    trace!("AuthManager.auth: returning cached token");
-                    return Ok(token.clone());
-                }
+            if let Some(ref token) = cache.token
+                && !token.is_expired()
+                && !token.expires_soon(self.config.refresh_threshold_secs)
+            {
+                trace!("AuthManager.auth: returning cached token");
+                return Ok(token.clone());
             }
         }
 
@@ -392,10 +384,10 @@ impl AuthManager {
 
         // Clear auth file if exists
         let auth_file = self.config.cortex_home.join("auth.json");
-        if auth_file.exists() {
-            if let Err(e) = tokio::fs::remove_file(&auth_file).await {
-                warn!("AuthManager.logout: failed to remove auth file: {}", e);
-            }
+        if auth_file.exists()
+            && let Err(e) = tokio::fs::remove_file(&auth_file).await
+        {
+            warn!("AuthManager.logout: failed to remove auth file: {}", e);
         }
 
         Ok(())
@@ -511,7 +503,7 @@ impl AuthManager {
                 .and_then(|t| t.refresh_token().map(|s| s.to_string()))
         };
 
-        let refresh_token = refresh_token
+        let _refresh_token = refresh_token
             .ok_or_else(|| AuthError::RefreshFailed("No refresh token available".to_string()))?;
 
         // Note: Actual token refresh would be implemented here
@@ -527,11 +519,11 @@ impl AuthManager {
         trace!("AuthManager.load_from_storage: loading credentials");
 
         // Check environment variables first if enabled
-        if self.config.enable_env_api_key {
-            if let Some(token) = self.load_from_env() {
-                debug!("AuthManager: loaded credentials from environment");
-                return Ok(Some(token));
-            }
+        if self.config.enable_env_api_key
+            && let Some(token) = self.load_from_env()
+        {
+            debug!("AuthManager: loaded credentials from environment");
+            return Ok(Some(token));
         }
 
         // Try to load from keyring
@@ -626,23 +618,23 @@ impl AuthManager {
             serde_json::from_str(&content).map_err(|e| AuthError::ParseError(e.to_string()))?;
 
         // Check for API key
-        if let Some(api_key) = auth_data.get("OPENAI_API_KEY").and_then(|v| v.as_str()) {
-            if !api_key.is_empty() {
-                return Ok(Some(AuthToken::new(api_key, "Bearer", "openai")));
-            }
+        if let Some(api_key) = auth_data.get("OPENAI_API_KEY").and_then(|v| v.as_str())
+            && !api_key.is_empty()
+        {
+            return Ok(Some(AuthToken::new(api_key, "Bearer", "openai")));
         }
 
         // Check for tokens
-        if let Some(tokens) = auth_data.get("tokens") {
-            if let Some(access_token) = tokens.get("access_token").and_then(|v| v.as_str()) {
-                let mut token = AuthToken::new(access_token, "Bearer", "chatgpt");
-
-                if let Some(refresh_token) = tokens.get("refresh_token").and_then(|v| v.as_str()) {
-                    token = token.with_refresh_token(refresh_token);
-                }
+        if let Some(tokens) = auth_data.get("tokens")
+            && let Some(access_token) = tokens.get("access_token").and_then(|v| v.as_str())
+        {
+            let mut token = AuthToken::new(access_token, "Bearer", "chatgpt");
 
-                return Ok(Some(token));
+            if let Some(refresh_token) = tokens.get("refresh_token").and_then(|v| v.as_str()) {
+                token = token.with_refresh_token(refresh_token);
             }
+
+            return Ok(Some(token));
         }
 
         Ok(None)

cortex-engine/src/permission/prompts.rs

@@ -145,8 +145,8 @@ impl PermissionPrompt {
         let mut output = String::new();
 
         // Header
-        output.push_str(&"🔐 Permission Request\n".to_string());
-        output.push_str(&"─────────────────────\n".to_string());
+        output.push_str("🔐 Permission Request\n");
+        output.push_str("─────────────────────\n");
 
         // Tool and action
         output.push_str(&format!("Tool: {}\n", self.tool));

cortex-engine/src/sandbox/windows.rs

@@ -248,7 +248,7 @@ pub async fn spawn_sandboxed_process(
         let mut cmd = Command::new(&command[0]);
         cmd.args(&command[1..]).current_dir(cwd).envs(env);
 
-        return cmd.spawn().map_err(|e| crate::error::CortexError::Io(e));
+        return cmd.spawn().map_err(crate::error::CortexError::Io);
     }
 
     let config = WindowsBackend::create_sandbox_config(policy, writable_roots);
@@ -275,7 +275,7 @@ pub async fn spawn_sandboxed_process(
                 cmd.env(CORTEX_SANDBOX_NETWORK_DISABLED_ENV_VAR, "1");
             }
 
-            cmd.spawn().map_err(|e| crate::error::CortexError::Io(e))
+            cmd.spawn().map_err(crate::error::CortexError::Io)
         }
         Err(e) => {
             warn!(
@@ -287,7 +287,7 @@ pub async fn spawn_sandboxed_process(
             let mut cmd = Command::new(&command[0]);
             cmd.args(&command[1..]).current_dir(cwd).envs(env);
 
-            cmd.spawn().map_err(|e| crate::error::CortexError::Io(e))
+            cmd.spawn().map_err(crate::error::CortexError::Io)
         }
     }
 }

cortex-engine/src/skills/mod.rs

@@ -174,12 +174,12 @@ impl SkillMetadata {
         }
 
         // Short description validation: max 1024 chars
-        if let Some(ref short_desc) = self.short_description {
-            if short_desc.len() > MAX_SHORT_DESCRIPTION_LEN {
-                return Err(CortexError::InvalidInput(format!(
-                    "Skill short_description must be at most {MAX_SHORT_DESCRIPTION_LEN} characters"
-                )));
-            }
+        if let Some(ref short_desc) = self.short_description
+            && short_desc.len() > MAX_SHORT_DESCRIPTION_LEN
+        {
+            return Err(CortexError::InvalidInput(format!(
+                "Skill short_description must be at most {MAX_SHORT_DESCRIPTION_LEN} characters"
+            )));
         }
 
         Ok(())
@@ -355,11 +355,11 @@ impl SkillRegistry {
         // This ensures higher priority skills overwrite lower priority ones in the registry
 
         // 4. Admin skills (lowest priority, Unix only)
-        if let Some(ref admin_dir) = self.admin_dir {
-            if admin_dir.exists() {
-                let skills = self.scan_directory(admin_dir, SkillScope::Admin)?;
-                all_skills.extend(skills);
-            }
+        if let Some(ref admin_dir) = self.admin_dir
+            && admin_dir.exists()
+        {
+            let skills = self.scan_directory(admin_dir, SkillScope::Admin)?;
+            all_skills.extend(skills);
         }
 
         // 3. System/plugin skills
@@ -377,11 +377,11 @@ impl SkillRegistry {
         }
 
         // 1. Repo skills (highest priority)
-        if let Some(ref repo_dir) = self.repo_dir {
-            if repo_dir.exists() {
-                let skills = self.scan_directory(repo_dir, SkillScope::Repo)?;
-                all_skills.extend(skills);
-            }
+        if let Some(ref repo_dir) = self.repo_dir
+            && repo_dir.exists()
+        {
+            let skills = self.scan_directory(repo_dir, SkillScope::Repo)?;
+            all_skills.extend(skills);
         }
 
         // Register all skills (later entries overwrite earlier ones with same name)
@@ -462,10 +462,9 @@ impl SkillRegistry {
             if matches!(
                 ext,
                 "md" | "py" | "sh" | "js" | "ts" | "json" | "yaml" | "yml" | "txt"
-            ) {
-                if let Some(name) = path.file_name().and_then(|n| n.to_str()) {
-                    files.push(name.to_string());
-                }
+            ) && let Some(name) = path.file_name().and_then(|n| n.to_str())
+            {
+                files.push(name.to_string());
             }
 
             // Include script directories

cortex-engine/src/thread_manager/mod.rs

@@ -14,7 +14,6 @@ mod tests;
 
 use once_cell::sync::OnceCell;
 use std::sync::Arc;
-use tokio::sync::RwLock;
 
 pub use state::*;
 pub use thread::*;

cortex-engine/src/tools/handlers/edit_file.rs

@@ -106,9 +106,8 @@ fn atomic_write_file(path: &Path, content: &str) -> std::io::Result<()> {
                 }
             }
         }
-        fs::rename(&temp_path, path).map_err(|e| {
+        fs::rename(&temp_path, path).inspect_err(|e| {
             let _ = fs::remove_file(&temp_path);
-            e
         })?;
     }