Merge pull request #54 from Atypical-Consulting/fix/specta-version-alignment

fix(ci): resolve all CI failures (frontend tests, specta deps, clippy)

Author: phmatray

src-tauri/Cargo.toml

@@ -17,8 +17,8 @@ tauri-plugin-dialog = "2"
 tauri-plugin-store = "2"
 tauri-plugin-window-state = "2"
 tauri-specta = { version = "2.0.0-rc.21", features = ["derive", "typescript"] }
-specta = "=2.0.0-rc.23"
-specta-typescript = "0.0.10"
+specta = "=2.0.0-rc.22"
+specta-typescript = "0.0.9"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 tokio = { version = "1", features = ["full"] }

src-tauri/src/git/branch.rs

@@ -555,8 +555,8 @@ pub async fn batch_delete_branches(
                     return Err("Cannot delete the current branch".to_string());
                 }
 
-                if !force {
-                    if let Some(ref head) = head_commit {
+                if !force
+                    && let Some(ref head) = head_commit {
                         let branch_commit = branch
                             .get()
                             .peel_to_commit()
@@ -568,7 +568,6 @@ pub async fn batch_delete_branches(
                             return Err(format!("Branch '{}' is not fully merged", name));
                         }
                     }
-                }
 
                 branch.delete().map_err(|e| e.message().to_string())?;
                 Ok(())

src-tauri/src/git/browse.rs

@@ -49,8 +49,8 @@ pub async fn list_repo_files(
         let mut files = Vec::new();
 
         // 1. Collect entries from HEAD tree (if it exists)
-        if let Ok(head) = repo.head() {
-            if let Ok(root_tree) = head.peel_to_tree() {
+        if let Ok(head) = repo.head()
+            && let Ok(root_tree) = head.peel_to_tree() {
                 let target_tree_opt = if path.is_empty() {
                     Some(root_tree)
                 } else {
@@ -101,7 +101,6 @@ pub async fn list_repo_files(
                     }
                 }
             }
-        }
 
         // 2. Merge in working-directory entries not already in the tree
         if let Some(workdir) = repo.workdir() {
@@ -111,8 +110,8 @@ pub async fn list_repo_files(
                 workdir.join(&path)
             };
 
-            if dir_to_scan.is_dir() {
-                if let Ok(read_dir) = std::fs::read_dir(&dir_to_scan) {
+            if dir_to_scan.is_dir()
+                && let Ok(read_dir) = std::fs::read_dir(&dir_to_scan) {
                     for dir_entry in read_dir.flatten() {
                         let name = dir_entry.file_name().to_string_lossy().into_owned();
                         // Skip hidden files/dirs (like .git) and already-known entries
@@ -124,7 +123,7 @@ pub async fn list_repo_files(
                         } else {
                             format!("{}/{}", path, name)
                         };
-                        let is_dir = dir_entry.file_type().map_or(false, |t| t.is_dir());
+                        let is_dir = dir_entry.file_type().is_ok_and(|t| t.is_dir());
                         let size = if is_dir {
                             0
                         } else {
@@ -138,7 +137,6 @@ pub async fn list_repo_files(
                         }
                     }
                 }
-            }
         }
 
         // Sort: dirs first alphabetically, then files alphabetically

src-tauri/src/git/changelog.rs

@@ -89,6 +89,7 @@ pub struct ChangelogCommit {
 /// Errors that can occur during changelog generation.
 #[derive(Debug, Error, Clone, Serialize, Deserialize, Type)]
 #[serde(tag = "type", content = "message")]
+#[allow(clippy::enum_variant_names)]
 pub enum ChangelogError {
     #[error("Git error: {0}")]
     GitError(String),
@@ -195,36 +196,32 @@ struct ParsedCommitInfo {
 /// Resolve a reference (tag, branch, or commit) to an Oid.
 fn resolve_ref(repo: &Repository, reference: &str) -> Result<Oid, ChangelogError> {
     // Try as tag first
-    if let Ok(tag_ref) = repo.find_reference(&format!("refs/tags/{}", reference)) {
-        if let Some(target) = tag_ref.target() {
+    if let Ok(tag_ref) = repo.find_reference(&format!("refs/tags/{}", reference))
+        && let Some(target) = tag_ref.target() {
             // Could be annotated tag, need to peel
-            if let Ok(obj) = repo.find_object(target, None) {
-                if let Ok(commit) = obj.peel_to_commit() {
+            if let Ok(obj) = repo.find_object(target, None)
+                && let Ok(commit) = obj.peel_to_commit() {
                     return Ok(commit.id());
                 }
-            }
             return Ok(target);
         }
-    }
 
     // Try as branch
-    if let Ok(branch_ref) = repo.find_reference(&format!("refs/heads/{}", reference)) {
-        if let Some(target) = branch_ref.target() {
+    if let Ok(branch_ref) = repo.find_reference(&format!("refs/heads/{}", reference))
+        && let Some(target) = branch_ref.target() {
             return Ok(target);
         }
-    }
 
     // Try as direct commit OID
     if let Ok(oid) = Oid::from_str(reference) {
         return Ok(oid);
     }
 
     // Try revparse
-    if let Ok(obj) = repo.revparse_single(reference) {
-        if let Ok(commit) = obj.peel_to_commit() {
+    if let Ok(obj) = repo.revparse_single(reference)
+        && let Ok(commit) = obj.peel_to_commit() {
             return Ok(commit.id());
         }
-    }
 
     Err(ChangelogError::GitError(format!(
         "Could not resolve reference: {}",
@@ -261,11 +258,10 @@ fn get_commits_in_range(
         let oid = oid_result?;
 
         // Stop if we've reached the 'from' commit
-        if let Some(from_id) = from_oid {
-            if oid == from_id {
+        if let Some(from_id) = from_oid
+            && oid == from_id {
                 break;
             }
-        }
 
         // Safety limit
         count += 1;
@@ -323,18 +319,15 @@ pub fn find_previous_tag(repo: &Repository, current: &str) -> Option<String> {
 
     for name in tag_names.iter().flatten() {
         let ref_name = format!("refs/tags/{}", name);
-        if let Ok(reference) = repo.find_reference(&ref_name) {
-            if let Some(target) = reference.target() {
-                if let Ok(obj) = repo.find_object(target, None) {
-                    if let Ok(commit) = obj.peel_to_commit() {
+        if let Ok(reference) = repo.find_reference(&ref_name)
+            && let Some(target) = reference.target()
+                && let Ok(obj) = repo.find_object(target, None)
+                    && let Ok(commit) = obj.peel_to_commit() {
                         let time = commit.time().seconds();
                         if time < current_time {
                             tags_with_time.push((name.to_string(), time));
                         }
                     }
-                }
-            }
-        }
     }
 
     // Sort by time descending and get the most recent one before current

src-tauri/src/git/clone.rs

@@ -49,16 +49,16 @@ fn extract_repo_name(url: &str) -> Option<String> {
     // Handle SSH format: git@host:user/repo.git
     let path_part = if url.contains('@') && url.contains(':') && !url.contains("://") {
         // SSH format
-        url.split(':').last()?
+        url.split(':').next_back()?
     } else {
         // HTTPS or other URL formats
-        url.split('/').last()?
+        url.split('/').next_back()?
     };
 
     // Get the repo name (last segment) and strip .git suffix
     let repo_name = path_part
         .split('/')
-        .last()
+        .next_back()
         .unwrap_or(path_part)
         .trim_end_matches(".git");
 
@@ -119,13 +119,12 @@ pub async fn clone_repository(
         }
     } else {
         // Create parent directories if they don't exist
-        if let Some(parent) = dest_path.parent() {
-            if !parent.exists() {
+        if let Some(parent) = dest_path.parent()
+            && !parent.exists() {
                 std::fs::create_dir_all(parent).map_err(|e| {
                     GitError::OperationFailed(format!("Failed to create parent directories: {}", e))
                 })?;
             }
-        }
     }
 
     // Send started event

src-tauri/src/git/commit.rs

@@ -170,7 +170,7 @@ pub async fn create_commit(
                 }
                 Err(e) if e.code() == git2::ErrorCode::UnbornBranch => {
                     // First commit - check if tree has any entries
-                    tree.len() > 0
+                    !tree.is_empty()
                 }
                 Err(e) => return Err(e.into()),
             }

src-tauri/src/git/conflict.rs

@@ -42,20 +42,18 @@ pub async fn list_conflict_files(
         let index = repo.index()?;
 
         let mut paths = Vec::new();
-        for conflict in index.conflicts()? {
-            if let Ok(conflict) = conflict {
-                // Prefer our path, then their, then ancestor
-                let path = conflict
-                    .our
-                    .as_ref()
-                    .or(conflict.their.as_ref())
-                    .or(conflict.ancestor.as_ref())
-                    .and_then(|entry| std::str::from_utf8(&entry.path).ok())
-                    .map(|s| s.to_string());
-
-                if let Some(p) = path {
-                    paths.push(p);
-                }
+        for conflict in index.conflicts()?.flatten() {
+            // Prefer our path, then their, then ancestor
+            let path = conflict
+                .our
+                .as_ref()
+                .or(conflict.their.as_ref())
+                .or(conflict.ancestor.as_ref())
+                .and_then(|entry| std::str::from_utf8(&entry.path).ok())
+                .map(|s| s.to_string());
+
+            if let Some(p) = path {
+                paths.push(p);
             }
         }
 

src-tauri/src/git/conventional.rs

@@ -560,12 +560,11 @@ pub fn extract_scopes_from_history(
 
     for commit in commits {
         // Try to parse each commit message
-        if let Ok(parsed) = git_conventional::Commit::parse(&commit.message_subject) {
-            if let Some(scope) = parsed.scope() {
+        if let Ok(parsed) = git_conventional::Commit::parse(&commit.message_subject)
+            && let Some(scope) = parsed.scope() {
                 let scope_str = scope.to_string();
                 *scope_counts.entry(scope_str).or_insert(0) += 1;
             }
-        }
     }
 
     // Filter out scopes with count < 2 (likely typos)

src-tauri/src/git/credentials.rs

@@ -32,11 +32,10 @@ pub fn create_credentials_callback(
         // Try credential helper from git config
         if allowed_types.contains(git2::CredentialType::USER_PASS_PLAINTEXT) && !tried_cred_helper {
             tried_cred_helper = true;
-            if let Ok(cfg) = git2::Config::open_default() {
-                if let Ok(cred) = git2::Cred::credential_helper(&cfg, url, username) {
+            if let Ok(cfg) = git2::Config::open_default()
+                && let Ok(cred) = git2::Cred::credential_helper(&cfg, url, username) {
                     return Ok(cred);
                 }
-            }
         }
 
         // Fallback: shell out to `git credential fill`

src-tauri/src/git/graph.rs

@@ -135,14 +135,12 @@ async fn get_commit_graph_impl(
 
         for branch_result in repo.branches(Some(git2::BranchType::Local))? {
             let (branch, _) = branch_result?;
-            if let Some(name) = branch.name()? {
-                if let Ok(reference) = branch.get().resolve() {
-                    if let Some(oid) = reference.target() {
+            if let Some(name) = branch.name()?
+                && let Ok(reference) = branch.get().resolve()
+                    && let Some(oid) = reference.target() {
                         branch_map.entry(oid).or_default().push(name.to_string());
                         branch_tips.push((oid, name.to_string()));
                     }
-                }
-            }
         }
 
         // ── 2. Identify HEAD and first-parent ancestors ──
@@ -188,8 +186,8 @@ async fn get_commit_graph_impl(
                 break;
             }
 
-            if let Ok(oid) = oid_result {
-                if let Ok(commit) = repo.find_commit(oid) {
+            if let Ok(oid) = oid_result
+                && let Ok(commit) = repo.find_commit(oid) {
                     let author = commit.author();
                     let parent_oids: Vec<String> =
                         commit.parent_ids().map(|id| id.to_string()).collect();
@@ -219,7 +217,6 @@ async fn get_commit_graph_impl(
                         ideological_branch: String::new(), // Will be set below
                     });
                 }
-            }
         }
 
         // ── 4. Ideological branch assignment (Ungit-style) ──