Merge upstream/main and resolve conflicts in enterprise_search_tool.py and google_search_agent_tool.py

Author: m-baden

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,34 +7,69 @@ assignees: ''
 
 ---
 
-** Please make sure you read the contribution guide and file the issues in the right place. **
-[Contribution guide.](https://google.github.io/adk-docs/contributing-guide/)
+## 🔴 Required Information
+*Please ensure all items in this section are completed to allow for efficient
+triaging. Requests without complete information may be rejected / deprioritized.
+If an item is not applicable to you - please mark it as N/A*
 
-**Describe the bug**
+**Describe the Bug:**
 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:
+**Steps to Reproduce:**
+Please provide a numbered list of steps to reproduce the behavior:
 1. Install '...'
 2. Run '....'
 3. Open '....'
 4. Provide error or stacktrace
 
-**Expected behavior**
+**Expected Behavior:**
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+**Observed Behavior:**
+What actually happened? Include error messages or crash stack traces here.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. macOS, Linux, Windows]
- - Python version(python -V):
- - ADK version(pip show google-adk):
+**Environment Details:**
+
+ - ADK Library Version (pip show google-adk):
+ - Desktop OS:** [e.g., macOS, Linux, Windows]
+ - Python Version (python -V):
+
+**Model Information:**
 
- **Model Information:**
  - Are you using LiteLLM: Yes/No
- - Which model is being used(e.g. gemini-2.5-pro)
+ - Which model is being used: (e.g., gemini-2.5-pro)
+
+---
+
+## 🟡 Optional Information
+*Providing this information greatly speeds up the resolution process.*
+
+**Regression:**
+Did this work in a previous version of ADK? If so, which one?
 
-**Additional context**
+**Logs:**
+Please attach relevant logs. Wrap them in code blocks (```) or attach a
+text file.
+```text
+// Paste logs here
+```
+
+**Screenshots / Video:**
+If applicable, add screenshots or screen recordings to help explain
+your problem.
+
+**Additional Context:**
 Add any other context about the problem here.
+
+**Minimal Reproduction Code:**
+Please provide a code snippet or a link to a Gist/repo that isolates the issue.
+```python
+// Code snippet here
+```
+
+**How often has this issue occurred?:**
+
+ - Always (100%)
+ - Often (50%+)
+ - Intermittently (<50%)
+ - Once / Rare

.github/ISSUE_TEMPLATE/feature_request.md

@@ -10,14 +10,39 @@ assignees: ''
 ** Please make sure you read the contribution guide and file the issues in the right place. **
 [Contribution guide.](https://google.github.io/adk-docs/contributing-guide/)
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+## 🔴 Required Information
+*Please ensure all items in this section are completed to allow for efficient
+triaging. Requests without complete information may be rejected / deprioritized.
+If an item is not applicable to you - please mark it as N/A*
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+### Is your feature request related to a specific problem?
+Please describe the problem you are trying to solve. (Ex: "I'm always frustrated
+when I have to manually handle X...")
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+### Describe the Solution You'd Like
+A clear and concise description of the feature or API change you want.
+Be specific about input/outputs if this involves an API change.
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+### Impact on your work
+How does this feature impact your work and what are you trying to achieve?
+If this is critical for you, tell us if there is a timeline by when you need
+this feature.
+
+### Willingness to contribute
+Are you interested in implementing this feature yourself or submitting a PR?
+(Yes/No)
+
+---
+
+## 🟡 Recommended Information
+
+### Describe Alternatives You've Considered
+A clear and concise description of any alternative solutions or workarounds
+you've considered and why they didn't work for you.
+
+### Proposed API / Implementation
+If you have ideas on how this should look in code, please share a
+pseudo-code example.
+
+### Additional Context
+Add any other context or screenshots about the feature request here.

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

@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
 

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

@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# 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.
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 2
 
@@ -96,7 +96,7 @@ jobs:
             echo ""
 
             set +e
-            FILES_WITH_FORBIDDEN_IMPORT=$(grep -lE '^from.*cli.*import.*$' $CHANGED_FILES)
+            FILES_WITH_FORBIDDEN_IMPORT=$(grep -lE '^from.*\bcli\b.*import.*$' $CHANGED_FILES)
             GREP_EXIT_CODE=$?
             set -e
 

.github/workflows/copybara-pr-handler.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Check for Copybara commits and close PRs
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.ADK_TRIAGE_AGENT }}
           script: |

.github/workflows/discussion_answering.yml

@@ -15,16 +15,16 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
 
       - name: Authenticate to Google Cloud
         id: auth
-        uses: 'google-github-actions/auth@v2'
+        uses: 'google-github-actions/auth@v3'
         with:
           credentials_json: '${{ secrets.ADK_GCP_SA_KEY }}'
 

.github/workflows/isort.yml

@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# 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.
@@ -26,12 +26,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 2
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 

.github/workflows/pr-triage.yml

@@ -20,10 +20,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
 

.github/workflows/pyink.yml

@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# 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.
@@ -26,12 +26,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 2
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 

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

@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# 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.
@@ -25,14 +25,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -48,14 +48,6 @@ jobs:
     - name: Run unit tests with pytest
       run: |
         source .venv/bin/activate
-        if [[ "${{ matrix.python-version }}" == "3.9" ]]; then
-          pytest tests/unittests \
-            --ignore=tests/unittests/a2a \
-            --ignore=tests/unittests/tools/mcp_tool \
-            --ignore=tests/unittests/artifacts/test_artifact_service.py \
-            --ignore=tests/unittests/tools/google_api_tool/test_googleapi_to_openapi_converter.py
-        else
-          pytest tests/unittests \
-            --ignore=tests/unittests/artifacts/test_artifact_service.py \
-            --ignore=tests/unittests/tools/google_api_tool/test_googleapi_to_openapi_converter.py
-        fi
+        pytest tests/unittests \
+          --ignore=tests/unittests/artifacts/test_artifact_service.py \
+          --ignore=tests/unittests/tools/google_api_tool/test_googleapi_to_openapi_converter.py