From 489d00ca3f096f69f3b05f9564b23bb70a2475c7 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 3 May 2026 11:17:02 +0900 Subject: fix(resolver): fail when a root require has no matching providers Mirror Composer's `Solver::checkForRootRequireProblems`: a root require that resolves to zero pool providers produces no SAT rule, so the solver previously succeeded with an empty plan instead of reporting the unresolvable requirement. `RuleSetGenerator::generate` now returns those misses alongside the rule set, and `resolve()` short-circuits into `ResolveError::NoSolution` so install/update exit with code 2 to match Composer. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../mozart-sat-resolver/src/rule_set_generator.rs | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'crates/mozart-sat-resolver/src') diff --git a/crates/mozart-sat-resolver/src/rule_set_generator.rs b/crates/mozart-sat-resolver/src/rule_set_generator.rs index 8f754e5..11c04cc 100644 --- a/crates/mozart-sat-resolver/src/rule_set_generator.rs +++ b/crates/mozart-sat-resolver/src/rule_set_generator.rs @@ -67,13 +67,21 @@ impl<'a> RuleSetGenerator<'a> { /// so the requirement is trivially satisfied without forcing a real /// provider. Without this, Mozart picks up an inline `provided/pkg` from /// the repository even though the root claims to fulfill it itself. + /// + /// Returns the generated rule set together with the list of root requires + /// that have no matching providers in the pool. Mirrors Composer's + /// `Solver::checkForRootRequireProblems`: a root require with zero + /// providers does not produce a SAT rule (so the solver would otherwise + /// succeed with an empty plan), but it must still be reported as an + /// unresolvable problem. pub fn generate( mut self, requires: &HashMap>, fixed_packages: &[PackageId], root_provides: &HashMap, root_replaces: &HashMap, - ) -> RuleSet { + ) -> (RuleSet, Vec<(String, Option)>) { + let mut missing_root_requires: Vec<(String, Option)> = Vec::new(); // Process fixed packages for &pkg_id in fixed_packages { if self.pool.is_unacceptable_fixed_package(pkg_id) { @@ -130,6 +138,8 @@ impl<'a> RuleSetGenerator<'a> { }, ); self.rules.add(rule, RuleType::Request); + } else { + missing_root_requires.push((name.clone(), constraint.clone())); } } @@ -154,7 +164,7 @@ impl<'a> RuleSetGenerator<'a> { // Add conflict rules self.add_conflict_rules(); - self.rules + (self.rules, missing_root_requires) } /// Add rules for a package and its transitive dependencies. @@ -388,7 +398,7 @@ mod tests { requires.insert("a/a".to_string(), None); let generator = RuleSetGenerator::new(&mut pool); - let rules = generator.generate(&requires, &[], &HashMap::new(), &HashMap::new()); + let (rules, _) = generator.generate(&requires, &[], &HashMap::new(), &HashMap::new()); // Should have a request rule: (1 | 2) let request_count = rules.iter_type(RuleType::Request).count(); @@ -428,7 +438,7 @@ mod tests { requires.insert("a/a".to_string(), None); let generator = RuleSetGenerator::new(&mut pool); - let rules = generator.generate(&requires, &[], &HashMap::new(), &HashMap::new()); + let (rules, _) = generator.generate(&requires, &[], &HashMap::new(), &HashMap::new()); // Should have: // 1. Request rule: (1) — root requires a/a @@ -441,7 +451,8 @@ mod tests { let mut pool = Pool::new(vec![make_input("php", "8.2.0.0")], vec![]); let generator = RuleSetGenerator::new(&mut pool); - let rules = generator.generate(&HashMap::new(), &[1], &HashMap::new(), &HashMap::new()); + let (rules, _) = + generator.generate(&HashMap::new(), &[1], &HashMap::new(), &HashMap::new()); // Should have an assertion rule: (1) let request_rules: Vec<_> = rules.iter_type(RuleType::Request).collect(); -- cgit v1.3.1