small adjustments

Author: lorenss-m

hud/environment/environment.py

@@ -406,6 +406,7 @@ async def __aexit__(
         self._tool_routing_built = False
         self._prompt_routing_built = False
         self._resource_routing_built = False
+        self._active_session = None  # Clear stale scenario state
 
     async def run_async(
         self,

hud/environment/scenarios.py

@@ -237,21 +237,20 @@ async def run_scenario_setup(self, scenario_name: str, args: dict[str, Any]) ->
                 env_name = getattr(self, "_source_env_name", None) or self.name
                 prompt_id = f"{env_name}:{scenario_name}"
 
-            # Use router to find which connection serves this prompt
-            conn_name = self._router.get_prompt_connection(prompt_id)  # type: ignore[attr-defined]
-            logger.debug(
-                "Remote scenario: prompt_id=%s, connection=%s",
-                prompt_id,
-                conn_name or "(not found in router)",
-            )
-
             # Serialize args for MCP prompt (only supports string values)
             serialized_args: dict[str, str] = {}
             for key, value in args.items():
                 serialized_args[key] = value if isinstance(value, str) else json.dumps(value)
 
             try:
                 result = await self.get_prompt(prompt_id, serialized_args)  # type: ignore[attr-defined]
+                # Get connection AFTER get_prompt succeeds (routing is now guaranteed built)
+                conn_name = self._router.get_prompt_connection(prompt_id)  # type: ignore[attr-defined]
+                logger.debug(
+                    "Remote scenario: prompt_id=%s, connection=%s",
+                    prompt_id,
+                    conn_name or "(not found in router)",
+                )
             except Exception as e:
                 # Fetch available scenarios for error context
                 try: