fix(resolver): use pkgbase for consistent indexing & optimize build force flag

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ "main", "master" ]
+    branches: [ "main", "master", "dev" ]
   pull_request:
-    branches: [ "main", "master" ]
+    branches: [ "main", "master", "dev" ]
 
 env:
   CARGO_TERM_COLOR: always

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- **Critical: Infinite Build Loop**: The outer retry `loop` around `build_package()` never broke on a successful build — only the inner install-retry loop had a `break`. This caused ax to repeatedly rebuild (and reinstall) the same package indefinitely. Added a `break` to exit the build retry loop after a successful build and install.
+- **Resolver**: Refactored AUR dependency resolver to use `pkgbase` consistently for indexing and lookups, fixing redundant builds for split packages and aliased names.
+- **Builder**: Optimized AUR build process by making the `makepkg` force-build flag (`-f`) conditional on the `clean-build` configuration.
+
+### CI
+- **Workflows**: CI now also triggers on pushes and pull requests targeting the `dev` branch
+
 ## [1.0.19] - 2026-03-02
 
 ### Fixed

src/builder.rs

@@ -141,7 +141,13 @@ pub fn build_package(
     // 6. Run makepkg
     debug!("Starting makepkg for {}", pkg);
     let mut makepkg = Command::new("makepkg");
-    makepkg.arg("-srf"); // Sync deps, Remove deps, Force build
+
+    // Base flags: Sync deps, Remove deps
+    let mut flags = "-sr".to_string();
+    if config.clean_build {
+        flags.push('f'); // Force build if cleaning
+    }
+    makepkg.arg(flags);
     if skip_pgp {
         makepkg.arg("--skippgpcheck");
     }

src/main.rs

@@ -219,7 +219,6 @@ async fn install_packages(
             loop {
                 match builder::build_package(&pkgbase, config, config.diff_viewer) {
                     Ok(package_paths) => {
-                        // Install the built packages using exact paths from makepkg --packagelist
                         // Install the built packages using exact paths from makepkg --packagelist
                         if !package_paths.is_empty() {
                             println!(
@@ -274,40 +273,37 @@ async fn install_packages(
                                         }
                                     }
                                 } else {
-                                    break; // Success, break install loop
+                                    break; 
                                 }
                             }
-                            // Move to next package in build order
                         } else {
                             println!("!! No packages were built for {}", pkgbase);
-                            break;
                         }
+                        break;
                     }
                     Err(e) => {
-                        // Build failed, prompt user
                         eprintln!(
                             "{} Build failed for {}: {:#}",
                             "!!".red().bold(),
                             pkgbase,
                             e
                         );
 
-                        // In --noconfirm mode, abort immediately
                         if config.no_confirm {
                             anyhow::bail!("Build of {} failed (--noconfirm)", pkgbase);
                         }
 
                         match interactive::prompt_on_error(
                             &format!("Build of {} failed", pkgbase),
-                            true, // Allow retry for build failures
+                            true, 
                         )? {
                             interactive::ErrorAction::Retry => {
                                 println!("{}", ":: Retrying build...".yellow());
-                                continue; // Retry loop
+                                continue; 
                             }
                             interactive::ErrorAction::Skip => {
                                 println!("{}", ":: Skipping package...".yellow());
-                                break; // Skip to next package
+                                break; 
                             }
                             interactive::ErrorAction::Abort => {
                                 anyhow::bail!("Aborting due to build failure");

src/resolver.rs

@@ -58,7 +58,9 @@ async fn collect_all_packages(
 
         // Parse .SRCINFO for dependencies
         if let Ok(metadata) = crate::parser::parse_srcinfo(&cache_path) {
-            aur_packages.insert(pkg.clone(), metadata.clone());
+            // Store by pkgbase to ensure consistent lookup in Phase 3
+            aur_packages.insert(metadata.pkgbase.clone(), metadata.clone());
+
             for dep in metadata.depends.iter().chain(metadata.make_depends.iter()) {
                 let clean_dep = crate::parser::clean_dependency(dep);
                 if !processed.contains(&clean_dep) {