refactor(resolver): drop redundant req.name from logs, split return, query both wheels and sdists

Remove explicit req.name prefix from log messages since
FromagerLogRecord adds it automatically via req_ctxvar_context.
Split ternary return into explicit if/return for consistency.
Query cache server for both wheels and sdists, picking the newest
version across both.

Co-Authored-By: Claude <claude@anthropic.com>
Signed-off-by: Rohan Devasthale <rdevasth@redhat.com>

Author: rd4398

src/fromager/bootstrap_requirement_resolver.py

@@ -163,18 +163,16 @@ def resolve(
 
             if not results and self.multiple_versions and self.cache_wheel_server_url:
                 logger.info(
-                    "%s: no results found with normal resolution, "
+                    "no results found with normal resolution, "
                     "falling back to the cache server %s",
-                    req.name,
                     self.cache_wheel_server_url,
                 )
                 results = self._resolve_from_cache_server(req)
 
             if not results:
                 logger.warning(
-                    "%s: resolver returned no results with "
+                    "resolver returned no results with "
                     "fallback wheel server URL %s and %s version mode",
-                    req.name,
                     self.cache_wheel_server_url or "(none)",
                     "multiple" if self.multiple_versions else "single",
                 )
@@ -185,7 +183,9 @@ def resolve(
 
         if not results:
             return []
-        return results if return_all_versions else [results[0]]
+        if return_all_versions:
+            return results
+        return [results[0]]
 
     def _resolve_from_cache_server(self, req: Requirement) -> list[tuple[str, Version]]:
         """Fall back to the remote wheel cache server for a cached version.
@@ -196,31 +196,32 @@ def _resolve_from_cache_server(self, req: Requirement) -> list[tuple[str, Versio
         re-processed without rebuilding every old version.
         """
         logger.info(
-            "%s: checking cache server %s for existing wheel",
-            req.name,
+            "checking cache server %s for existing build",
             self.cache_wheel_server_url,
         )
-        try:
-            provider = finders.PyPICacheProvider(
-                cache_server_url=self.cache_wheel_server_url,
-                constraints=self.ctx.constraints,
-            )
-            results = resolver.find_all_matching_from_provider(provider, req)
-            if results:
-                url, version = results[0]
-                logger.info(
-                    "%s: found version %s on cache server",
-                    req.name,
-                    version,
+        best: tuple[str, Version] | None = None
+        for include_sdists, include_wheels in [(False, True), (True, False)]:
+            try:
+                provider = finders.PyPICacheProvider(
+                    cache_server_url=self.cache_wheel_server_url,
+                    constraints=self.ctx.constraints,
+                    include_sdists=include_sdists,
+                    include_wheels=include_wheels,
                 )
-                return [(url, version)]
-        except Exception as err:
-            logger.warning(
-                "%s: error checking cache server %s: %s",
-                req.name,
-                self.cache_wheel_server_url,
-                err,
-            )
+                results = resolver.find_all_matching_from_provider(provider, req)
+                if results:
+                    url, version = results[0]
+                    if best is None or version > best[1]:
+                        best = (url, version)
+            except Exception as err:
+                logger.warning(
+                    "error checking cache server %s: %s",
+                    self.cache_wheel_server_url,
+                    err,
+                )
+        if best is not None:
+            logger.info("found version %s on cache server", best[1])
+            return [best]
         return []
 
     def get_cached_resolution(