Merge branch 'main' into feature/async_database_session_service

Author: GitMarco27

.github/ISSUE_TEMPLATE/bug_report.md

@@ -14,11 +14,12 @@ assignees: ''
 A clear and concise description of what the bug is.
 
 **To Reproduce**
+Please share a minimal code and data to reproduce your problem.
 Steps to reproduce the behavior:
 1. Install '...'
 2. Run '....'
 3. Open '....'
-4. See error
+4. Provie error or stacktrace
 
 **Expected behavior**
 A clear and concise description of what you expected to happen.
@@ -27,12 +28,13 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
+ - OS: [e.g. macOS, Linux, Windows]
  - Python version(python -V):
  - ADK version(pip show google-adk):
 
  **Model Information:**
- For example, which model is being used.
+ - Are you using LiteLLM: Yes/No
+ - Which model is being used(e.g. gemini-2.5-pro)
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/analyze-releases-for-adk-docs-updates.yml

@@ -23,6 +23,11 @@ jobs:
         with:
           python-version: '3.11'
 
+      - name: Load adk-bot SSH Private Key
+        uses: webfactory/ssh-agent@v0.9.0
+        with:
+          ssh-private-key: ${{ secrets.ADK_BOT_SSH_PRIVATE_KEY }}
+
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

AGENTS.md

@@ -17,6 +17,8 @@ Please refer to [ADK Project Overview and Architecture](https://github.com/googl
 - ADK live related configs are in [run_config.py](https://github.com/google/adk-python/blob/main/src/google/adk/agents/run_config.py).
 - ADK live under multi-agent scenario: we convert the audio into text. This text will be passed to next agent as context.
 - Most logics are in [base_llm_flow.py](https://github.com/google/adk-python/blob/main/src/google/adk/flows/llm_flows/base_llm_flow.py) and [gemini_llm_connection.py](https://github.com/google/adk-python/blob/main/src/google/adk/models/gemini_llm_connection.py).
+- Input transcription and output transcription should be added to session as Event.
+- User audio or model audio should be saved into artifacts with a reference in Event to it.
 - Tests are in [tests/unittests/streaming](https://github.com/google/adk-python/tree/main/tests/unittests/streaming).
 
 ## ADK: Style Guides

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [1.14.1](https://github.com/google/adk-python/compare/v1.14.0...v1.14.1) (2025-09-12)
+
+### Bug Fixes
+
+* Fix logging issues with RemoteA2aAgent [0c1f1fa](https://github.com/google/adk-python/commit/0c1f1fadeb5a6357af9cad0eff5d5e7103fc88b0)
+
 ## [1.14.0](https://github.com/google/adk-python/compare/v1.13.0...v1.14.0) (2025-09-10)
 
 ### Features

README.md

@@ -27,11 +27,13 @@ Agent Development Kit (ADK) is a flexible and modular framework for developing a
 
 ---
 
-## ✨ What's new
+## 🔥 What's new
 
 - **Agent Config**: Build agents without code. Check out the
   [Agent Config](https://google.github.io/adk-docs/agents/config/) feature.
 
+- **Tool Confirmation**: A [tool confirmation flow(HITL)](https://google.github.io/adk-docs/tools/confirmation/) that can guard tool execution with explicit confirmation and custom input
+
 ## ✨ Key Features
 
 - **Rich Tool Ecosystem**: Utilize pre-built tools, custom functions,
@@ -94,7 +96,7 @@ from google.adk.tools import google_search
 
 root_agent = Agent(
     name="search_assistant",
-    model="gemini-2.0-flash", # Or your preferred Gemini model
+    model="gemini-2.5-flash", # Or your preferred Gemini model
     instruction="You are a helpful assistant. Answer user questions using Google Search when needed.",
     description="An assistant that can search the web.",
     tools=[google_search]
@@ -109,13 +111,13 @@ Define a multi-agent system with coordinator agent, greeter agent, and task exec
 from google.adk.agents import LlmAgent, BaseAgent
 
 # Define individual agents
-greeter = LlmAgent(name="greeter", model="gemini-2.0-flash", ...)
-task_executor = LlmAgent(name="task_executor", model="gemini-2.0-flash", ...)
+greeter = LlmAgent(name="greeter", model="gemini-2.5-flash", ...)
+task_executor = LlmAgent(name="task_executor", model="gemini-2.5-flash", ...)
 
 # Create parent agent and assign children via sub_agents
 coordinator = LlmAgent(
     name="Coordinator",
-    model="gemini-2.0-flash",
+    model="gemini-2.5-flash",
     description="I coordinate greetings and tasks.",
     sub_agents=[ # Assign sub_agents here
         greeter,

contributing/samples/adk_agent_builder_assistant/instruction_embedded.template

@@ -6,6 +6,12 @@ You are an intelligent Agent Builder Assistant specialized in creating and confi
 
 Help users design, build, and configure sophisticated multi-agent systems for the ADK framework. You guide users through the agent creation process by asking clarifying questions, suggesting optimal architectures, and generating properly formatted YAML configuration files that comply with the ADK AgentConfig schema.
 
+## CRITICAL BEHAVIOR RULE
+
+**NEVER assume users want to create agents unless they explicitly ask to CREATE, BUILD, GENERATE, IMPLEMENT, or UPDATE something.**
+
+When users ask informational questions like "find me examples", "show me samples", "how do I", etc., they want INFORMATION ONLY. Provide the information and stop. Do not offer to create anything or ask for root directories.
+
 ## Core Capabilities
 
 1. **Agent Architecture Design**: Analyze requirements and suggest appropriate agent types (LlmAgent, SequentialAgent, ParallelAgent, LoopAgent)
@@ -26,7 +32,27 @@ Always reference this schema when creating configurations to ensure compliance.
 ## Workflow Guidelines
 
 ### 1. Discovery Phase
-- **ROOT DIRECTORY ESTABLISHMENT**:
+- **DETERMINE USER INTENT FIRST**:
+  * **INFORMATIONAL QUESTIONS** (Answer directly WITHOUT asking for root directory):
+    - "Could you find me examples of..." / "Find me samples of..."
+    - "Show me how to..." / "How do I..."
+    - "What is..." / "What are..." / "Explain..."
+    - "Can you show me..." / "Do you have examples of..."
+    - "I'm looking for information about..." / "I need to understand..."
+    - Questions about ADK capabilities, concepts, or existing implementations
+    - **CRITICAL**: For informational questions, provide the requested information and STOP. Do NOT offer to create, build, or generate anything unless explicitly asked.
+  * **CREATION/BUILDING INTENT** (Only then ask for root directory):
+    - "Create a new agent..." / "Build me an agent..." 
+    - "Generate an agent..." / "Implement an agent..."
+    - "Update my agent..." / "Modify my agent..." / "Change my agent..."
+    - "I want to create..." / "Help me build..." / "Help me update..."
+    - "Set up a project..." / "Make me an agent..."
+
+**EXAMPLE OF CORRECT BEHAVIOR:**
+- User: "Could you find me a sample agent that can list my calendar events?"
+- ✅ CORRECT: Search for examples, show the samples found, explain how they work, and STOP.
+- ❌ WRONG: "Before I proceed with creating an agent..." or asking for root directory.
+- **ROOT DIRECTORY ESTABLISHMENT** (Only for Creation/Building):
   * **FIRST**: Check SESSION CONTEXT section below for "Established Root Directory"
   * **IF ESTABLISHED**: Use the existing session root directory - DO NOT ask again
   * **IF NOT ESTABLISHED**: Ask user for root directory to establish working context

contributing/samples/adk_agent_builder_assistant/instruction_query.template

@@ -6,6 +6,12 @@ You are an intelligent Agent Builder Assistant specialized in creating and confi
 
 Help users design, build, and configure sophisticated multi-agent systems for the ADK framework. You guide users through the agent creation process by asking clarifying questions, suggesting optimal architectures, and generating properly formatted YAML configuration files that comply with the ADK AgentConfig schema.
 
+## CRITICAL BEHAVIOR RULE
+
+**NEVER assume users want to create agents unless they explicitly ask to CREATE, BUILD, GENERATE, IMPLEMENT, or UPDATE something.**
+
+When users ask informational questions like "find me examples", "show me samples", "how do I", etc., they want INFORMATION ONLY. Provide the information and stop. Do not offer to create anything or ask for root directories.
+
 ## Core Capabilities
 
 1. **Agent Architecture Design**: Analyze requirements and suggest appropriate agent types (LlmAgent, SequentialAgent, ParallelAgent, LoopAgent)
@@ -29,7 +35,27 @@ Always use the query_schema tool when you need specific ADK AgentConfig schema i
 ## Workflow Guidelines
 
 ### 1. Discovery Phase
-- **ROOT DIRECTORY ESTABLISHMENT**:
+- **DETERMINE USER INTENT FIRST**:
+  * **INFORMATIONAL QUESTIONS** (Answer directly WITHOUT asking for root directory):
+    - "Could you find me examples of..." / "Find me samples of..."
+    - "Show me how to..." / "How do I..."
+    - "What is..." / "What are..." / "Explain..."
+    - "Can you show me..." / "Do you have examples of..."
+    - "I'm looking for information about..." / "I need to understand..."
+    - Questions about ADK capabilities, concepts, or existing implementations
+    - **CRITICAL**: For informational questions, provide the requested information and STOP. Do NOT offer to create, build, or generate anything unless explicitly asked.
+  * **CREATION/BUILDING INTENT** (Only then ask for root directory):
+    - "Create a new agent..." / "Build me an agent..." 
+    - "Generate an agent..." / "Implement an agent..."
+    - "Update my agent..." / "Modify my agent..." / "Change my agent..."
+    - "I want to create..." / "Help me build..." / "Help me update..."
+    - "Set up a project..." / "Make me an agent..."
+
+**EXAMPLE OF CORRECT BEHAVIOR:**
+- User: "Could you find me a sample agent that can list my calendar events?"
+- ✅ CORRECT: Search for examples, show the samples found, explain how they work, and STOP.
+- ❌ WRONG: "Before I proceed with creating an agent..." or asking for root directory.
+- **ROOT DIRECTORY ESTABLISHMENT** (Only for Creation/Building):
   * **FIRST**: Check SESSION CONTEXT section below for "Established Root Directory"
   * **IF ESTABLISHED**: Use the existing session root directory - DO NOT ask again
   * **IF NOT ESTABLISHED**: Ask user for root directory to establish working context

contributing/samples/adk_agent_builder_assistant/utils/adk_source_utils.py

@@ -23,7 +23,7 @@
 from typing import Optional
 
 # Set up logger for ADK source utils
-logger = logging.getLogger(__name__)
+logger = logging.getLogger("google_adk." + __name__)
 
 # Global cache for ADK AgentConfig schema to avoid repeated file reads
 _schema_cache: Optional[Dict[str, Any]] = None
@@ -49,7 +49,7 @@ def find_adk_source_folder(start_path: Optional[str] = None) -> Optional[str]:
       adk_path = find_adk_source_folder("/path/to/project")
   """
   if start_path is None:
-    start_path = os.getcwd()
+    start_path = os.path.dirname(__file__)
 
   current_path = Path(start_path).resolve()
 

contributing/samples/adk_answering_agent/agent.py

@@ -78,7 +78,7 @@
 5. **Post the response**:
    * If you can find relevant information, use the `add_comment_to_discussion`
      tool to add a comment to the discussion.
-   * If you post a comment, add the label {BOT_RESPONSE_LABEL} to the discussion
+   * If you post a comment, add the label "{BOT_RESPONSE_LABEL}" to the discussion
      using the `add_label_to_discussion` tool.
 
 IMPORTANT:

contributing/samples/adk_answering_agent/main.py

@@ -208,8 +208,6 @@ async def main():
     # If we have discussion JSON data, include it in the prompt
     # to avoid API call
     if discussion_json_data:
-      import json
-
       discussion_json_str = json.dumps(discussion_json_data, indent=2)
       prompt = (
           f"Please help answer this GitHub discussion #{discussion_number}."