Merge branch 'main' into custom-session-id-with-agent-engine

Author: guillaumeblaquiere

contributing/samples/hello_world/main.py

@@ -48,8 +48,15 @@ async def run_prompt(session: Session, new_message: str):
         session_id=session.id,
         new_message=content,
     ):
-      if event.content.parts and event.content.parts[0].text:
-        print(f'** {event.author}: {event.content.parts[0].text}')
+      if event.content.parts:
+        for part in event.content.parts:
+          if part.text:
+            print(f'** {event.author}: {part.text}')
+          if part.function_call:
+            print(
+                f'** {event.author} calls tool: {part.function_call.name} with'
+                f' args {part.function_call.args}'
+            )
 
   async def run_prompt_bytes(session: Session, new_message: str):
     content = types.Content(
@@ -74,6 +81,7 @@ async def check_rolls_in_state(rolls_size: int):
     session = await runner.session_service.get_session(
         app_name=app_name, user_id=user_id_1, session_id=session_11.id
     )
+    print('** session.state:', session.state)
     assert len(session.state['rolls']) == rolls_size
     for roll in session.state['rolls']:
       assert roll > 0 and roll <= 100
@@ -82,9 +90,9 @@ async def check_rolls_in_state(rolls_size: int):
   print('Start time:', start_time)
   print('------------------------------------')
   await run_prompt(session_11, 'Hi')
-  await run_prompt(session_11, 'Roll a die with 100 sides')
+  await run_prompt(session_11, 'Roll a dice with 100 sides')
   await check_rolls_in_state(1)
-  await run_prompt(session_11, 'Roll a die again with 100 sides.')
+  await run_prompt(session_11, 'Roll a dice again with 100 sides.')
   await check_rolls_in_state(2)
   await run_prompt(session_11, 'What numbers did I got?')
   await run_prompt_bytes(session_11, 'Hi bytes')

src/google/adk/agents/remote_a2a_agent.py

@@ -233,7 +233,7 @@ async def _ensure_httpx_client(self) -> httpx.AsyncClient:
           httpx_client=self._httpx_client,
           streaming=False,
           polling=False,
-          supported_transports=[A2ATransport.jsonrpc],
+          supported_transports=[A2ATransport.jsonrpc, A2ATransport.http_json],
       )
       self._a2a_client_factory = A2AClientFactory(config=client_config)
     return self._httpx_client

src/google/adk/cli/adk_web_server.py

@@ -60,6 +60,8 @@
 from ..agents.base_agent import BaseAgent
 from ..agents.live_request_queue import LiveRequest
 from ..agents.live_request_queue import LiveRequestQueue
+from ..agents.llm_agent import LlmAgent
+from ..agents.llm_agent import ToolUnion
 from ..agents.run_config import RunConfig
 from ..agents.run_config import StreamingMode
 from ..apps.app import App
@@ -90,7 +92,10 @@
 from ..runners import Runner
 from ..sessions.base_session_service import BaseSessionService
 from ..sessions.session import Session
+from ..utils.agent_info import AgentInfo
+from ..utils.agent_info import get_agents_dict
 from ..utils.context_utils import Aclosing
+from ..utils.feature_decorator import experimental
 from ..version import __version__
 from .cli_eval import EVAL_SESSION_ID_PREFIX
 from .utils import cleanup
@@ -489,6 +494,7 @@ class AppInfo(common.BaseModel):
   description: str
   language: Literal["yaml", "python"]
   is_computer_use: bool = False
+  agents: Optional[dict[str, AgentInfo]] = None
 
 
 class ListAppsResponse(common.BaseModel):
@@ -958,6 +964,25 @@ async def list_apps(
         return ListAppsResponse(apps=[AppInfo(**app) for app in apps_info])
       return self.agent_loader.list_agents()
 
+    @experimental
+    @app.get("/apps/{app_name}/app-info", response_model_exclude_none=True)
+    async def get_adk_app_info(app_name: str) -> AppInfo:
+      """Returns the detailed info for a given ADK app."""
+      agent_or_app = self.agent_loader.load_agent(app_name)
+      root_agent = self._get_root_agent(agent_or_app)
+      if isinstance(root_agent, LlmAgent):
+        return AppInfo(
+            name=app_name,
+            root_agent_name=root_agent.name,
+            description=root_agent.description,
+            language="python",
+            agents=get_agents_dict(root_agent),
+        )
+      else:
+        raise HTTPException(
+            status_code=400, detail="Root agent is not an LlmAgent"
+        )
+
     @app.get("/debug/trace/{event_id}", tags=[TAG_DEBUG])
     async def get_trace_dict(event_id: str) -> Any:
       event_dict = trace_dict.get(event_id, None)

src/google/adk/cli/cli_create.py

@@ -64,7 +64,10 @@
 
 _EXPRESS_TOS_MSG = """
 Google Cloud Express Mode Terms of Service: https://cloud.google.com/terms/google-cloud-express
-By continuing, you agree to the Terms of Service for Vertex AI Express Mode.
+By using this application, you agree to the Google Cloud Express Mode terms of service and any
+applicable services and APIs. You also agree to only use this application for your trade,
+business, craft, or profession.
+
 Would you like to proceed? (yes/no)
 """
 

src/google/adk/cli/cli_deploy.py

@@ -949,6 +949,13 @@ def to_agent_engine(
 
     click.echo('Resolving files and dependencies...')
     agent_config = {}
+    if agent_engine_config_file and not os.path.exists(
+        agent_engine_config_file
+    ):
+      raise click.ClickException(
+          'Agent engine config file not found: '
+          f'{parent_folder}/{agent_engine_config_file}'
+      )
     if not agent_engine_config_file:
       # Attempt to read the agent engine config from .agent_engine_config.json in the dir (if any).
       agent_engine_config_file = os.path.join(

src/google/adk/tools/skill_toolset.py

@@ -510,8 +510,15 @@ def _build_wrapper_code(
 
     if ext == "py":
       argv_list = [script_path]
-      for k, v in script_args.items():
+      for k, v in script_args.get("args", {}).items():
         argv_list.extend([f"--{k}", str(v)])
+      for k, v in script_args.get("short_options", {}).items():
+        argv_list.extend([f"-{k}", str(v)])
+      positional_args = script_args.get("positional_args", [])
+      if positional_args:
+        argv_list.append("--")
+        for v in positional_args:
+          argv_list.append(str(v))
       code_lines.extend([
           f"      sys.argv = {argv_list!r}",
           "      try:",
@@ -522,8 +529,15 @@ def _build_wrapper_code(
       ])
     elif ext in ("sh", "bash"):
       arr = ["bash", script_path]
-      for k, v in script_args.items():
+      for k, v in script_args.get("args", {}).items():
         arr.extend([f"--{k}", str(v)])
+      for k, v in script_args.get("short_options", {}).items():
+        arr.extend([f"-{k}", str(v)])
+      positional_args = script_args.get("positional_args", [])
+      if positional_args:
+        arr.append("--")
+        for v in positional_args:
+          arr.append(str(v))
       timeout = self._script_timeout
       code_lines.extend([
           "      try:",
@@ -590,8 +604,23 @@ def _get_declaration(self) -> types.FunctionDeclaration | None:
                 "args": {
                     "type": "object",
                     "description": (
-                        "Optional arguments to pass to the script as key-value"
-                        " pairs."
+                        "Optional arguments to pass as long options (e.g.,"
+                        " {'n': 5} becomes --n 5)."
+                    ),
+                },
+                "short_options": {
+                    "type": "object",
+                    "description": (
+                        "Optional SHORT options to pass (e.g., {'n': 5}"
+                        " becomes -n 5)."
+                    ),
+                },
+                "positional_args": {
+                    "type": "array",
+                    "items": {"type": "string"},
+                    "description": (
+                        "Optional list of positional arguments in exact order"
+                        " (e.g., ['input.txt', 'output.txt'])."
                     ),
                 },
             },
@@ -604,16 +633,38 @@ async def run_async(
   ) -> Any:
     skill_name = args.get("skill_name")
     script_path = args.get("script_path")
-    script_args = args.get("args", {})
-    if not isinstance(script_args, dict):
+    script_args = {
+        "args": args.get("args", {}),
+        "short_options": args.get("short_options", {}),
+        "positional_args": args.get("positional_args", []),
+    }
+    if not isinstance(script_args["args"], dict):
       return {
           "error": (
               "'args' must be a JSON object (key-value pairs),"
-              f" got {type(script_args).__name__}."
+              f" got {type(script_args['args']).__name__}."
           ),
           "error_code": "INVALID_ARGS_TYPE",
       }
 
+    if not isinstance(script_args["short_options"], dict):
+      return {
+          "error": (
+              "'short_options' must be a JSON object (key-value pairs),"
+              f" got {type(script_args['short_options']).__name__}."
+          ),
+          "error_code": "INVALID_SHORT_OPTIONS_TYPE",
+      }
+
+    if not isinstance(script_args["positional_args"], list):
+      return {
+          "error": (
+              "'positional_args' must be a JSON array (list),"
+              f" got {type(script_args['positional_args']).__name__}."
+          ),
+          "error_code": "INVALID_POSITIONAL_ARGS_TYPE",
+      }
+
     if not skill_name:
       return {
           "error": "Skill name is required.",

src/google/adk/utils/agent_info.py

@@ -0,0 +1,77 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from __future__ import annotations
+
+from typing import Any
+
+from google.genai import types
+import pydantic
+
+from ..agents.llm_agent import LlmAgent
+from ..agents.llm_agent import ToolUnion
+from ..tools.base_tool import BaseTool
+from ..tools.base_toolset import BaseToolset
+from ..tools.function_tool import FunctionTool
+
+
+class AgentInfo(pydantic.BaseModel):
+  name: str
+  description: str
+  instruction: str
+  tools: list[types.Tool]
+  sub_agents: list[str]
+
+
+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())
+    else:
+      final_tools.append(FunctionTool(tool))
+  return [
+      types.Tool(function_declarations=[tool._get_declaration()])
+      for tool in final_tools
+      if tool._get_declaration()
+  ]
+
+
+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):
+    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)
+        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),
+        sub_agents=sub_agent_names,
+    )
+
+  _traverse(agent)
+  return agents_dict

tests/unittests/agents/test_remote_a2a_agent.py

@@ -35,6 +35,7 @@
 from a2a.types import TaskStatus as A2ATaskStatus
 from a2a.types import TaskStatusUpdateEvent
 from a2a.types import TextPart
+from a2a.types import TransportProtocol as A2ATransport
 from google.adk.a2a.agent import ParametersConfig
 from google.adk.a2a.agent import RequestInterceptor
 from google.adk.a2a.agent.config import A2aRemoteAgentConfig
@@ -198,6 +199,10 @@ async def test_ensure_httpx_client_creates_new_client(self):
     assert client is not None
     assert agent._httpx_client == client
     assert agent._httpx_client_needs_cleanup is True
+    assert agent._a2a_client_factory._config.supported_transports == [
+        A2ATransport.jsonrpc,
+        A2ATransport.http_json,
+    ]
 
   @pytest.mark.asyncio
   async def test_ensure_httpx_client_reuses_existing_client(self):