Merge branch 'main' into feat/function-tools-enum-support

Author: SOORAJTS2001

.github/workflows/pr-triage.yml

@@ -3,10 +3,16 @@ name: ADK Pull Request Triaging Agent
 on:
   pull_request_target:
     types: [opened, reopened, edited]
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: 'The Pull Request number to triage'
+        required: true
+        type: 'string'
 
 jobs:
   agent-triage-pull-request:
-    if: "!contains(github.event.pull_request.labels.*.name, 'bot triaged') && !contains(github.event.pull_request.labels.*.name, 'google-contributor')"
+    if: github.event_name == 'workflow_dispatch' || !contains(github.event.pull_request.labels.*.name, 'google-contributor')
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
@@ -33,7 +39,7 @@ jobs:
           GOOGLE_GENAI_USE_VERTEXAI: 0
           OWNER: 'google'
           REPO: 'adk-python'
-          PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
+          PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number || github.event.inputs.pr_number }}
           INTERACTIVE: ${{ vars.PR_TRIAGE_INTERACTIVE }}
           PYTHONPATH: contributing/samples
         run: python -m adk_pr_triaging_agent.main

.github/workflows/triage.yml

@@ -3,8 +3,6 @@ name: ADK Issue Triaging Agent
 on:
   issues:
     types: [opened, reopened]
-  schedule:
-    - cron: '0 */6 * * *' # every 6h
 
 jobs:
   agent-triage-issues:

README.md

@@ -43,7 +43,7 @@ Meeting link:
 [Join the call](http://meet.google.com/gjm-gfim-ctz)
 
 Add to your calendar
-[Event calendar invite](https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=MDUydWo1dHV1dHFtNzJuM3E0bmEyMW12ZnZfMjAyNTEwMTVUMTYzMDAwWiBjXzljNWVjODhhMmQyYWU5YjY5Mzk4ODU1MGZkNDA5MjVmYjgxYjM4MTI1NGNjYTgzNmRkMjMwNzRiMjNmYzcyZDVAZw&tmsrc=c_9c5ec88a2d2ae9b693988550fd40925fb81b381254cca836dd23074b23fc72d5%40group.calendar.google.com), [.ics file](https://calendar.google.com/calendar/ical/c_9c5ec88a2d2ae9b693988550fd40925fb81b381254cca836dd23074b23fc72d5%40group.calendar.google.com/public/basic.ics), [ADK community calendar](https://calendar.google.com/calendar/embed?src=c_9c5ec88a2d2ae9b693988550fd40925fb81b381254cca836dd23074b23fc72d5%40group.calendar.google.com&ctz=America%2FLos_Angeles)
+[Event calendar invite](https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=MDUydWo1dHV1dHFtNzJuM3E0bmEyMW12ZnZfMjAyNTEwMTVUMTYzMDAwWiBjXzljNWVjODhhMmQyYWU5YjY5Mzk4ODU1MGZkNDA5MjVmYjgxYjM4MTI1NGNjYTgzNmRkMjMwNzRiMjNmYzcyZDVAZw&tmsrc=c_9c5ec88a2d2ae9b693988550fd40925fb81b381254cca836dd23074b23fc72d5%40group.calendar.google.com), [.ics file](https://calendar.google.com/calendar/ical/c_9c5ec88a2d2ae9b693988550fd40925fb81b381254cca836dd23074b23fc72d5%40group.calendar.google.com/public/basic.ics), [ADK community calendar](https://calendar.google.com/calendar/embed?src=c_9c5ec88a2d2ae9b693988550fd40925fb81b381254cca836dd23074b23fc72d5%40group.calendar.google.com&ctz=America%2FLos_Angeles), [ADK Community Call RSVP](https://google.qualtrics.com/jfe/form/SV_3K0RJZ64H1BexqS)
 
 Agenda:
 [Julia] ADK Roadmap

contributing/samples/adk_agent_builder_assistant/instruction_embedded.template

@@ -64,7 +64,9 @@ Always reference this schema when creating configurations to ensure compliance.
 - **MANDATORY CONFIRMATION**: Say "Please confirm what model you want to use" - do NOT assume or suggest defaults
 - **EXAMPLES**: "gemini-2.5-flash", "gemini-2.5-pro", etc.
 - **RATIONALE**: Only LlmAgent requires model specification; workflow agents do not
-- **DEFAULT ONLY**: Use "{default_model}" only if user explicitly says "use default" or similar
+- **DEFAULT MODEL**: If user says "use default" or "proceed with default model", use: {default_model}
+  * This is the actual model name, NOT the literal string "default"
+  * The default model for this session is: {default_model}
 - **WORKFLOW**: Complete all Discovery steps (including this model selection) → Then proceed to Design Phase with model already chosen
 
 ### 2. Design Phase
@@ -127,6 +129,43 @@ Always reference this schema when creating configurations to ensure compliance.
   * **Remember**: Always extract just the folder name after the last slash/separator
 - No function declarations in YAML (handled automatically by ADK)
 
+**🚨 CRITICAL: Built-in Tools vs Custom Tools**
+
+**ADK Built-in Tools** (use directly, NO custom Python file needed):
+- **Naming**: Use simple name WITHOUT dots (e.g., `google_search`, NOT `google.adk.tools.google_search`)
+- **No custom code**: Do NOT create Python files for built-in tools
+- **Available built-in tools**:
+  * `google_search` - Google Search tool
+  * `enterprise_web_search` - Enterprise web search
+  * `google_maps_grounding` - Google Maps grounding
+  * `url_context` - URL context fetching
+  * `VertexAiSearchTool` - Vertex AI Search (class name)
+  * `exit_loop` - Exit loop control
+  * `get_user_choice` - User choice interaction
+  * `load_artifacts` - Load artifacts
+  * `load_memory` - Load memory
+  * `preload_memory` - Preload memory
+  * `transfer_to_agent` - Transfer to another agent
+
+**Example - Built-in Tool Usage (CORRECT):**
+```yaml
+tools:
+  - name: google_search
+  - name: url_context
+```
+
+**Example - Built-in Tool Usage (WRONG):**
+```yaml
+tools:
+  - name: cb.tools.google_search_tool.google_search_tool  # ❌ WRONG - treating built-in as custom
+```
+**DO NOT create Python files like `tools/google_search_tool.py` for built-in tools!**
+
+**Custom Tools** (require Python implementation):
+- **Naming**: Use dotted path: `{{project_folder_name}}.tools.{{module_name}}.{{function_name}}`
+- **Require Python file**: Must create actual Python file in `tools/` directory
+- **Example**: `my_project.tools.dice_tool.roll_dice` → requires `tools/dice_tool.py` with `roll_dice()` function
+
 **TOOL IMPLEMENTATION STRATEGY:**
 - **For simple/obvious tools**: Implement them directly with actual working code
   * Example: dice rolling, prime checking, basic math, file operations
@@ -286,11 +325,11 @@ from typing import Optional
 from google.genai import types
 from google.adk.agents.callback_context import CallbackContext
 
-def content_filter_callback(context: CallbackContext) -> Optional[types.Content]:
+def content_filter_callback(callback_context: CallbackContext) -> Optional[types.Content]:
     """After agent callback to filter sensitive content."""
-    # Access the response content through context
-    if hasattr(context, 'response') and context.response:
-        response_text = str(context.response)
+    # Access the response content through callback_context
+    if hasattr(callback_context, 'response') and callback_context.response:
+        response_text = str(callback_context.response)
         if "confidential" in response_text.lower():
             filtered_text = response_text.replace("confidential", "[FILTERED]")
             return types.Content(parts=[types.Part(text=filtered_text)])
@@ -306,12 +345,12 @@ from google.adk.models.llm_request import LlmRequest
 from google.adk.models.llm_response import LlmResponse
 from google.adk.agents.callback_context import CallbackContext
 
-def log_model_request(context: CallbackContext, request: LlmRequest) -> Optional[LlmResponse]:
+def log_model_request(callback_context: CallbackContext, request: LlmRequest) -> Optional[LlmResponse]:
     """Before model callback to log requests."""
     print(f"Model request: {{request.contents}}")
     return None  # Return None to proceed with original request
 
-def modify_model_response(context: CallbackContext, response: LlmResponse) -> Optional[LlmResponse]:
+def modify_model_response(callback_context: CallbackContext, response: LlmResponse) -> Optional[LlmResponse]:
     """After model callback to modify response."""
     # Modify response if needed
     return response  # Return modified response or None for original
@@ -325,25 +364,25 @@ from typing import Any, Dict, Optional
 from google.adk.tools.base_tool import BaseTool
 from google.adk.tools.tool_context import ToolContext
 
-def validate_tool_input(tool: BaseTool, args: Dict[str, Any], context: ToolContext) -> Optional[Dict]:
+def validate_tool_input(tool: BaseTool, tool_args: Dict[str, Any], tool_context: ToolContext) -> Optional[Dict]:
     """Before tool callback to validate input."""
     # Validate or modify tool arguments
-    if "unsafe_param" in args:
-        del args["unsafe_param"]
-    return args  # Return modified args or None for original
+    if "unsafe_param" in tool_args:
+        del tool_args["unsafe_param"]
+    return tool_args  # Return modified args or None for original
 
-def log_tool_result(tool: BaseTool, args: Dict[str, Any], context: ToolContext, result: Dict) -> Optional[Dict]:
+def log_tool_result(tool: BaseTool, tool_args: Dict[str, Any], tool_context: ToolContext, result: Dict) -> Optional[Dict]:
     """After tool callback to log results."""
     print(f"Tool {{tool.name}} executed with result: {{result}}")
     return None  # Return None to keep original result
 ```
 
 ## Callback Signature Summary:
-- **Agent Callbacks**: `(CallbackContext) -> Optional[types.Content]`
-- **Before Model**: `(CallbackContext, LlmRequest) -> Optional[LlmResponse]`
-- **After Model**: `(CallbackContext, LlmResponse) -> Optional[LlmResponse]`
-- **Before Tool**: `(BaseTool, Dict[str, Any], ToolContext) -> Optional[Dict]`
-- **After Tool**: `(BaseTool, Dict[str, Any], ToolContext, Dict) -> Optional[Dict]`
+- **Agent Callbacks**: `(callback_context: CallbackContext) -> Optional[types.Content]`
+- **Before Model**: `(callback_context: CallbackContext, request: LlmRequest) -> Optional[LlmResponse]`
+- **After Model**: `(callback_context: CallbackContext, response: LlmResponse) -> Optional[LlmResponse]`
+- **Before Tool**: `(tool: BaseTool, tool_args: Dict[str, Any], tool_context: ToolContext) -> Optional[Dict]`
+- **After Tool**: `(tool: BaseTool, tool_args: Dict[str, Any], tool_context: ToolContext, result: Dict) -> Optional[Dict]`
 
 ## Important ADK Requirements
 
@@ -369,7 +408,7 @@ def log_tool_result(tool: BaseTool, args: Dict[str, Any], context: ToolContext,
 **ADK AgentConfig Schema Compliance:**
 - Always reference the embedded ADK AgentConfig schema to verify field requirements
 - **MODEL FIELD RULES**:
-  * **LlmAgent**: `model` field is REQUIRED (unless inherited from ancestor) - Ask user for preference only when LlmAgent is needed, use "{default_model}" if not specified
+  * **LlmAgent**: `model` field is REQUIRED (unless inherited from ancestor) - Ask user for preference only when LlmAgent is needed, use {default_model} if user says to use default
   * **Workflow Agents**: `model` field is FORBIDDEN - Remove model field entirely for Sequential/Parallel/Loop agents
 - Optional fields: description, instruction, tools, sub_agents as defined in ADK AgentConfig schema
 
@@ -404,7 +443,6 @@ def log_tool_result(tool: BaseTool, args: Dict[str, Any], context: ToolContext,
 2. No redundant suggest_file_path calls for pre-approved paths
 3. Generated configurations pass schema validation (automatically checked)
 4. Follow ADK naming and organizational conventions
-5. Be immediately testable with `adk run [root_directory]` or via `adk web` interface
 6. Include clear, actionable instructions for each agent
 7. Use appropriate tools for intended functionality
 
@@ -424,14 +462,3 @@ def log_tool_result(tool: BaseTool, args: Dict[str, Any], context: ToolContext,
 6. **Focus on collaboration** - Ensure user gets exactly what they need with clear understanding
 
 **This workflow eliminates inefficiencies and ensures users get well-organized, predictable file structures in their chosen location.**
-
-## Running Generated Agents
-
-**Correct ADK Commands:**
-- `adk run [project_directory]` - Run agent from project directory (e.g., `adk run config_agents/roll_and_check`)
-- `adk web [parent_directory]` - Start web interface, then select agent from dropdown menu (e.g., `adk web config_agents`)
-- **Key Rule**: Always use the project directory for `adk run`, and parent directory for `adk web`
-
-**Incorrect Commands to Avoid:**
-- `adk run [project_directory]/root_agent.yaml` - Do NOT specify the YAML file directly
-- `adk web` without parent directory - Must specify the parent folder containing the agent projects

contributing/samples/adk_agent_builder_assistant/tools/cleanup_unused_files.py

@@ -14,44 +14,53 @@
 
 """Cleanup unused files tool for Agent Builder Assistant."""
 
-from pathlib import Path
 from typing import Any
 from typing import Dict
 from typing import List
 from typing import Optional
 
+from google.adk.tools.tool_context import ToolContext
+
+from ..utils.resolve_root_directory import resolve_file_path
+from ..utils.resolve_root_directory import resolve_file_paths
+
 
 async def cleanup_unused_files(
-    root_directory: str,
     used_files: List[str],
+    tool_context: ToolContext,
     file_patterns: Optional[List[str]] = None,
     exclude_patterns: Optional[List[str]] = None,
 ) -> Dict[str, Any]:
   """Identify and optionally delete unused files in project directories.
 
   This tool helps clean up unused tool files when agent configurations change.
   It identifies files that match patterns but aren't referenced in used_files
-  list.
+  list. Paths are resolved automatically using the tool context.
 
   Args:
-    root_directory: Root directory to scan for unused files
     used_files: List of file paths currently in use (should not be deleted)
+    tool_context: Tool execution context (provides session state)
     file_patterns: List of glob patterns to match files (default: ["*.py"])
     exclude_patterns: List of patterns to exclude (default: ["__init__.py"])
 
   Returns:
     Dict containing cleanup results:
       - success: bool indicating if scan succeeded
-      - root_directory: absolute path to scanned directory
       - unused_files: list of unused files found
       - deleted_files: list of files actually deleted
       - backup_files: list of backup files created
       - errors: list of error messages
       - total_freed_space: total bytes freed by deletions
   """
+  session_state = tool_context.state
+  root_path = resolve_file_path(".", session_state)
+
   try:
-    root_path = Path(root_directory).resolve()
-    used_files_set = {Path(f).resolve() for f in used_files}
+    root_path = root_path.resolve()
+    resolved_used_files = {
+        path.resolve()
+        for path in resolve_file_paths(used_files or [], session_state)
+    }
 
     # Set defaults
     if file_patterns is None:
@@ -61,7 +70,6 @@ async def cleanup_unused_files(
 
     result = {
         "success": False,
-        "root_directory": str(root_path),
         "unused_files": [],
         "deleted_files": [],
         "backup_files": [],
@@ -85,7 +93,7 @@ async def cleanup_unused_files(
     # Identify unused files
     unused_files = []
     for file_path in all_files:
-      if file_path not in used_files_set:
+      if file_path.resolve() not in resolved_used_files:
         unused_files.append(file_path)
 
     result["unused_files"] = [str(f) for f in unused_files]
@@ -99,7 +107,6 @@ async def cleanup_unused_files(
   except Exception as e:
     return {
         "success": False,
-        "root_directory": root_directory,
         "unused_files": [],
         "deleted_files": [],
         "backup_files": [],

contributing/samples/adk_pr_triaging_agent/agent.py

@@ -69,8 +69,10 @@ def get_pull_request_details(pr_number: int) -> str:
       repository(owner: $owner, name: $repo) {
         pullRequest(number: $prNumber) {
           id
+          number
           title
           body
+          state
           author {
             login
           }
@@ -298,7 +300,10 @@ def add_comment_to_pr(pr_number: int, comment: str) -> dict[str, Any]:
       # 4. Steps
       When you are given a PR, here are the steps you should take:
       - Call the `get_pull_request_details` tool to get the details of the PR.
-      - Skip the PR (i.e. do not label or comment) if the PR is closed or is labeled with "{BOT_LABEL}" or "google-contributior".
+      - Skip the PR (i.e. do not label or comment) if any of the following is true:
+        - the PR is closed
+        - the PR is labeled with "google-contributior"
+        - the PR is already labelled with the above labels (e.g. "documentation", "services", "tools", etc.) and has a reviewer assigned.
       - Check if the PR is following the contribution guidelines.
         - If it's not following the guidelines, recommend or add a comment to the PR that points to the contribution guidelines (https://github.com/google/adk-python/blob/main/CONTRIBUTING.md).
         - If it's following the guidelines, recommend or add a label to the PR.

contributing/samples/adk_pr_triaging_agent/main.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import asyncio
+import logging
 import time
 
 from adk_pr_triaging_agent import agent
@@ -21,11 +22,14 @@
 from adk_pr_triaging_agent.settings import REPO
 from adk_pr_triaging_agent.utils import call_agent_async
 from adk_pr_triaging_agent.utils import parse_number_string
+from google.adk.cli.utils import logs
 from google.adk.runners import InMemoryRunner
 
 APP_NAME = "adk_pr_triaging_app"
 USER_ID = "adk_pr_triaging_user"
 
+logs.setup_adk_logger(level=logging.DEBUG)
+
 
 async def main():
   runner = InMemoryRunner(

contributing/samples/built_in_multi_tools/agent.py

@@ -17,7 +17,7 @@
 
 from dotenv import load_dotenv
 from google.adk import Agent
-from google.adk.tools.google_search_tool import google_search
+from google.adk.tools.google_search_tool import GoogleSearchTool
 from google.adk.tools.tool_context import ToolContext
 from google.adk.tools.vertex_ai_search_tool import VertexAiSearchTool
 
@@ -57,7 +57,9 @@ def roll_die(sides: int, tool_context: ToolContext) -> int:
     """,
     tools=[
         roll_die,
-        VertexAiSearchTool(data_store_id=VERTEXAI_DATASTORE_ID),
-        google_search,
+        VertexAiSearchTool(
+            data_store_id=VERTEXAI_DATASTORE_ID, bypass_multi_tools_limit=True
+        ),
+        GoogleSearchTool(bypass_multi_tools_limit=True),
     ],
 )