Merge branch 'main' into fix/node-runner-state-delta

Author: DeanChensj

.github/workflows/check-file-contents.yml

@@ -100,3 +100,37 @@ jobs:
           else
             echo "✅ No relevant Python files found."
           fi
+
+      - name: Check for hardcoded googleapis.com endpoints
+        run: |
+          git fetch origin ${GITHUB_BASE_REF}
+          CHANGED_FILES=$(git diff --diff-filter=ACMR --name-only origin/${GITHUB_BASE_REF}...HEAD | grep -E '\.py$' || true)
+          if [ -n "$CHANGED_FILES" ]; then
+            echo "Checking for hardcoded endpoints in: $CHANGED_FILES"
+
+            # 1. Identify files containing any googleapis.com URL.
+            set +e
+            FILES_WITH_ENDPOINTS=$(grep -lE 'https?://[a-zA-Z0-9.-]+\.googleapis\.com' $CHANGED_FILES)
+            
+            # 2. From those, identify files that are MISSING the required mTLS version.
+            if [ -n "$FILES_WITH_ENDPOINTS" ]; then
+              FILES_MISSING_MTLS=$(grep -L '.mtls.googleapis.com' $FILES_WITH_ENDPOINTS)
+            fi
+            set -e
+
+            if [ -n "$FILES_MISSING_MTLS" ]; then
+              echo "❌ Found hardcoded googleapis.com endpoints without mTLS support."
+              echo "The following files must define both standard and mTLS (.mtls.googleapis.com) endpoints"
+              echo "to support dynamic endpoint selection as required by security policy:"
+              echo "$FILES_MISSING_MTLS"
+              echo ""
+              echo "To fix this, please follow these steps:"
+              echo "1. Initialize an AuthorizedSession with your credentials."
+              echo "2. Use 'mtls.has_default_client_cert_source() from google-auth' to check for available client certificates."
+              echo "3. If certificates are present, use 'session.configure_mtls_channel()'."
+              echo "4. Dynamically select the '.mtls.' variant of the endpoint when mTLS is active."
+              exit 1
+            else
+              echo "✅ All hardcoded endpoints have corresponding mTLS definitions or no endpoints found."
+            fi
+          fi

.github/workflows/python-unit-tests.yml

@@ -12,6 +12,7 @@ permissions:
 jobs:
   test:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     strategy:
       matrix:
         python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]

src/google/adk/cli/api_server.py

@@ -1043,7 +1043,7 @@ async def get_adk_app_info(app_name: str) -> AppInfo:
             root_agent_name=root_agent.name,
             description=root_agent.description,
             language="python",
-            agents=get_agents_dict(root_agent),
+            agents=await get_agents_dict(root_agent),
         )
       else:
         raise HTTPException(

src/google/adk/utils/agent_info.py

@@ -34,14 +34,16 @@ class AgentInfo(pydantic.BaseModel):
   sub_agents: list[str]
 
 
-def get_tools_info(tools: list[ToolUnion]) -> list[Any]:
+async def get_tools_info(tools: list[ToolUnion]) -> list[Any]:
   """Returns the info for a given list of tools."""
   final_tools = []
   for tool in tools:
     if isinstance(tool, BaseTool):
       final_tools.append(tool)
     elif isinstance(tool, BaseToolset):
-      final_tools.extend(tool.get_tools())
+      # Await the async coroutine call natively!
+      tools_res = await tool.get_tools()
+      final_tools.extend(tools_res)
     else:
       final_tools.append(FunctionTool(tool))
   return [
@@ -51,27 +53,27 @@ def get_tools_info(tools: list[ToolUnion]) -> list[Any]:
   ]
 
 
-def get_agents_dict(agent: LlmAgent) -> dict[str, AgentInfo]:
+async def get_agents_dict(agent: LlmAgent) -> dict[str, AgentInfo]:
   """Returns a dict with info for the agent and its sub-agents."""
   agents_dict = {}
 
-  def _traverse(current_agent: LlmAgent):
+  async def _traverse(current_agent: LlmAgent):
     if current_agent.name in agents_dict:
       return
 
     sub_agent_names = []
     for sub_agent in current_agent.sub_agents:
       if isinstance(sub_agent, LlmAgent):
-        _traverse(sub_agent)
+        await _traverse(sub_agent)
         sub_agent_names.append(sub_agent.name)
 
     agents_dict[current_agent.name] = AgentInfo(
         name=current_agent.name,
         description=current_agent.description,
         instruction=current_agent.instruction,
-        tools=get_tools_info(current_agent.tools),
+        tools=await get_tools_info(current_agent.tools),
         sub_agents=sub_agent_names,
     )
 
-  _traverse(agent)
+  await _traverse(agent)
   return agents_dict