chore: Improve agent name filtering and HITL event skipping in replay tests

Enhance agent_test_runner's replay stability:
- Dynamically collect all agent names in the App (including sub-agents and dynamically loaded module members) to improve event author filtering.
- Properly recognize and skip HITL interrupts (adk_request_input, adk_request_credential, adk_request_confirmation) during replay mock responses collection.

Co-authored-by: Shangjie Chen <deanchen@google.com>
PiperOrigin-RevId: 940024965

Author: DeanChensj

src/google/adk/cli/agent_test_runner.py

@@ -22,10 +22,11 @@
 from typing import Optional
 from unittest import mock
 
-from google.adk.agents.base_agent import BaseAgent
 from google.adk.apps.app import App
 from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
 from google.adk.cli.utils.agent_loader import AgentLoader
+from google.adk.events._branch_path import _BranchPath
+from google.adk.events._node_path_builder import _NodePathBuilder
 from google.adk.events.event import Event as AdkEvent
 from google.adk.memory.in_memory_memory_service import InMemoryMemoryService
 from google.adk.models.base_llm import BaseLlm
@@ -189,9 +190,20 @@ def normalize_events(events, is_json=False):
     if "content" in d and isinstance(d["content"], dict):
       content = d["content"]
       if "parts" in content and isinstance(content["parts"], list):
+        is_hitl = False
         for part in content["parts"]:
           if isinstance(part, dict) and "thoughtSignature" in part:
             del part["thoughtSignature"]
+          if isinstance(part, dict) and "functionCall" in part:
+            fc_name = part["functionCall"].get("name")
+            if fc_name in (
+                "adk_request_input",
+                "adk_request_confirmation",
+                "adk_request_credential",
+            ):
+              is_hitl = True
+        if is_hitl:
+          content.pop("role", None)
 
     if "longRunningToolIds" in d:
       if isinstance(d["longRunningToolIds"], list):
@@ -250,33 +262,6 @@ def _make_nodes_sequential(obj, visited=None):
       _make_nodes_sequential(obj._node, visited)
 
 
-def _get_all_agent_names(obj, visited=None):
-  if visited is None:
-    visited = set()
-
-  if id(obj) in visited:
-    return set()
-  visited.add(id(obj))
-
-  from google.adk.workflow._parallel_worker import _ParallelWorker
-  from google.adk.workflow._workflow import Workflow
-
-  names = set()
-  if isinstance(obj, BaseAgent) and hasattr(obj, "name"):
-    names.add(obj.name)
-    if hasattr(obj, "sub_agents") and obj.sub_agents:
-      for sub in obj.sub_agents:
-        names.update(_get_all_agent_names(sub, visited))
-  elif isinstance(obj, Workflow):
-    if obj.graph and obj.graph.nodes:
-      for node in obj.graph.nodes:
-        names.update(_get_all_agent_names(node, visited))
-  elif isinstance(obj, _ParallelWorker):
-    if hasattr(obj, "_node"):
-      names.update(_get_all_agent_names(obj._node, visited))
-  return names
-
-
 def _extract_user_content(event: dict) -> Optional[types.Content]:
   """Extracts user content from an event dict and returns a types.Content object.
 
@@ -386,6 +371,17 @@ def _normalize_ids(events: list[AdkEvent]) -> list[AdkEvent]:
         if fc_id in final_orig_to_new_id:
           e.branch = f"task:{final_orig_to_new_id[fc_id]}"
 
+    if getattr(e, "branch", None):
+      bp = _BranchPath.from_string(e.branch)
+      new_segments = []
+      for segment in bp.segments:
+        parts = segment.rsplit("@", 1)
+        if len(parts) > 1 and parts[1] in final_orig_to_new_id:
+          new_segments.append(f"{parts[0]}@{final_orig_to_new_id[parts[1]]}")
+        else:
+          new_segments.append(segment)
+      e.branch = str(_BranchPath(new_segments))
+
     # Task wrappers stamp isolation_scope with the dispatching FC's
     # id (random at run time) and ``node_info.path`` encodes
     # ``<name>@<fc.id>`` for the same id — remap both.
@@ -472,26 +468,6 @@ def test_agent_replay(agent_dir, test_file, monkeypatch):
         else agent_or_app
     )
     _make_nodes_sequential(root_agent)
-    agent_names = _get_all_agent_names(root_agent)
-
-    import inspect
-
-    # Dynamically locate the loaded agent module from sys.modules
-    mod = sys.modules.get(f"{agent_dir.name}.agent") or sys.modules.get(
-        agent_dir.name
-    )
-    if not mod:
-      # Fallback for namespace packages or nested imports
-      for k, v in sys.modules.items():
-        if k.endswith(f"{agent_dir.name}.agent") or k.endswith(agent_dir.name):
-          mod = v
-          break
-
-    # Reflectively find all Agent instances defined in the module (e.g. dynamic agents)
-    if mod:
-      for _, obj in inspect.getmembers(mod):
-        if isinstance(obj, BaseAgent) and hasattr(obj, "name"):
-          agent_names.add(obj.name)
 
     with open(test_file, "r") as f:
       session_data = json.load(f)
@@ -536,21 +512,25 @@ def test_agent_replay(agent_dir, test_file, monkeypatch):
             last_was_set_model_response = False
             continue
 
-          if ev.get("author", "") not in agent_names:
-            continue
-
-          parts = content_dict.get("parts", [])
-          is_sys_hitl = False
-          for part in parts:
-            if "functionCall" in part:
-              fc_name = part["functionCall"].get("name")
+          parts_list = content_dict.get("parts", [])
+          is_workflow_hitl = False
+          node_path = ev.get("nodeInfo", {}).get("path", "")
+          for p in parts_list:
+            if isinstance(p, dict) and "functionCall" in p:
+              fc_name = p["functionCall"].get("name")
               if fc_name in (
                   "adk_request_confirmation",
                   "adk_request_credential",
               ):
-                is_sys_hitl = True
+                is_workflow_hitl = True
+                break
+              if (
+                  fc_name == "adk_request_input"
+                  and _NodePathBuilder.from_string(node_path).parent is not None
+              ):
+                is_workflow_hitl = True
                 break
-          if is_sys_hitl:
+          if is_workflow_hitl:
             continue
 
           try: