Test fix / review feedback.

[ci skip-rust]

[ci skip-build-wheels]

src/python/pants/bsp/protocol.py

@@ -157,19 +157,12 @@ def _handle_inbound_message(self, *, method_name: str, params: Any):
         execution_request = self._scheduler_session.execution_request(
             requests=[(method_mapping.response_type, params)],
         )
-        returns, throws = self._scheduler_session.execute(execution_request)
-        if len(returns) == 1 and len(throws) == 0:
-            # Initialize the BSPContext with the client-supplied init parameters. See earlier comment on why this
-            # call to `BSPContext.initialize_connection` is safe.
-            if method_name == self._INITIALIZE_METHOD_NAME:
-                self._context.initialize_connection(request, self.notify_client)
-            return returns[0][1].value.to_json_dict()
-        elif len(returns) == 0 and len(throws) == 1:
-            raise throws[0][1].exc
-        else:
-            raise AssertionError(
-                f"Received unexpected result from engine: returns={returns}; throws={throws}"
-            )
+        (result,) = self._scheduler_session.execute(execution_request)
+        # Initialize the BSPContext with the client-supplied init parameters. See earlier comment on why this
+        # call to `BSPContext.initialize_connection` is safe.
+        if method_name == self._INITIALIZE_METHOD_NAME:
+            self._context.initialize_connection(request, self.notify_client)
+        return result.to_json_dict()
 
     # Called by `Endpoint` to dispatch requests and notifications.
     # TODO: Should probably vendor `Endpoint` so we can detect notifications versus method calls, which

src/python/pants/engine/streaming_workunit_handler.py

@@ -7,7 +7,7 @@
 import threading
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from typing import Any, Callable, Dict, Iterable, Sequence, Tuple
+from typing import Any, Callable, Iterable, Sequence, Tuple
 
 from pants.base.specs import Specs
 from pants.engine.addresses import Addresses
@@ -106,7 +106,7 @@ def get_expanded_specs(self) -> ExpandedSpecs:
         request = self._scheduler.execution_request([(Addresses, params), (Targets, params)])
         unexpanded_addresses, expanded_targets = self._scheduler.execute(request)
 
-        targets_dict: Dict[str, list[TargetInfo]] = {str(addr): [] for addr in unexpanded_addresses}
+        targets_dict: dict[str, list[TargetInfo]] = {str(addr): [] for addr in unexpanded_addresses}
         for target in expanded_targets:
             source = targets_dict.get(str(target.address.spec), None)
             if source is None:

src/python/pants/jvm/testutil.py

@@ -103,7 +103,8 @@ def rules():
     return [
         *collect_rules(),
         *system_binaries.rules(),
+        QueryRule(CoarsenedTargets, (Addresses,)),
         QueryRule(RenderedClasspath, (Classpath,)),
         QueryRule(RenderedClasspath, (ClasspathEntry,)),
-        QueryRule(CoarsenedTargets, (Addresses,)),
+        QueryRule(Targets, (Addresses,)),
     ]