Merge branch 'main' into fix-transfer-to-agent-parameters-issue

Author: hangfei

.gemini/settings.json

@@ -0,0 +1,3 @@
+{
+  "contextFileName": "AGENTS.md"
+}

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

@@ -70,7 +70,7 @@ jobs:
 
             # Use grep -L to find files that DO NOT contain the pattern.
             # This command will output a list of non-compliant files.
-            FILES_MISSING_IMPORT=$(grep -L 'from __future__ import annotations' $CHANGED_FILES)
+            FILES_MISSING_IMPORT=$(grep -L 'from __future__ import annotations' $CHANGED_FILES || true)
 
             # Check if the list of non-compliant files is empty
             if [ -z "$FILES_MISSING_IMPORT" ]; then

.github/workflows/pr-commit-check.yml

@@ -0,0 +1,62 @@
+# .github/workflows/pr-commit-check.yml
+# This GitHub Action workflow checks if a pull request has more than one commit.
+# If it does, it fails the check and instructs the user to squash their commits.
+
+name: 'PR Commit Check'
+
+# This workflow runs on pull request events.
+# It's configured to run on any pull request that is opened or synchronized (new commits pushed).
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+# Defines the jobs that will run as part of the workflow.
+jobs:
+  check-commit-count:
+    # The type of runner that the job will run on. 'ubuntu-latest' is a good default.
+    runs-on: ubuntu-latest
+
+    # The steps that will be executed as part of the job.
+    steps:
+      # Step 1: Check out the code
+      # This action checks out your repository under $GITHUB_WORKSPACE, so your workflow can access it.
+      - name: Checkout Code
+        uses: actions/checkout@v4
+        with:
+          # We need to fetch all commits to accurately count them.
+          # '0' means fetch all history for all branches and tags.
+          fetch-depth: 0
+
+      # Step 2: Count the commits in the pull request
+      # This step runs a script to get the number of commits in the PR.
+      - name: Count Commits
+        id: count_commits
+        # We use `git rev-list --count` to count the commits.
+        # ${{ github.event.pull_request.base.sha }} is the commit SHA of the base branch.
+        # ${{ github.event.pull_request.head.sha }} is the commit SHA of the head branch (the PR branch).
+        # The '..' syntax gives us the list of commits in the head branch that are not in the base branch.
+        # The output of the command (the count) is stored in a step output variable named 'count'.
+        run: |
+          count=$(git rev-list --count ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }})
+          echo "commit_count=$count" >> $GITHUB_OUTPUT
+
+      # Step 3: Check if the commit count is greater than 1
+      # This step uses the output from the previous step to decide whether to pass or fail.
+      - name: Check Commit Count
+        # This step only runs if the 'commit_count' output from the 'count_commits' step is greater than 1.
+        if: steps.count_commits.outputs.commit_count > 1
+        # If the condition is met, the workflow will exit with a failure status.
+        run: |
+          echo "This pull request has ${{ steps.count_commits.outputs.commit_count }} commits."
+          echo "Please squash them into a single commit before merging."
+          echo "You can use git rebase -i HEAD~N"
+          echo "...where N is the number of commits you want to squash together. The PR check conveniently tells you this number! For example, if the check says you have 3 commits, you would run: git rebase -i HEAD~3."
+          echo "Because you have rewritten the commit history, you must use the --force flag to update the pull request: git push --force"
+          exit 1
+
+      # Step 4: Success message
+      # This step runs if the commit count is not greater than 1 (i.e., it's 1).
+      - name: Success
+        if: steps.count_commits.outputs.commit_count <= 1
+        run: |
+          echo "This pull request has a single commit. Great job!"

.github/workflows/triage.yml

@@ -40,4 +40,5 @@ jobs:
           ISSUE_TITLE: ${{ github.event.issue.title }}
           ISSUE_BODY: ${{ github.event.issue.body }}
           ISSUE_COUNT_TO_PROCESS: '3' # Process 3 issues at a time on schedule
-        run: python contributing/samples/adk_triaging_agent/main.py
+          PYTHONPATH: contributing/samples
+        run: python -m adk_triaging_agent.main

AGENTS.md

@@ -0,0 +1,114 @@
+# Gemini CLI / Gemini Code Assist Context
+
+This document provides context for the Gemini CLI and Gemini Code Assist to understand the project and assist with development.
+
+## Project Overview
+
+The Agent Development Kit (ADK) is an open-source, code-first Python toolkit for building, evaluating, and deploying sophisticated AI agents with flexibility and control. While optimized for Gemini and the Google ecosystem, ADK is model-agnostic, deployment-agnostic, and is built for compatibility with other frameworks. ADK was designed to make agent development feel more like software development, to make it easier for developers to create, deploy, and orchestrate agentic architectures that range from simple tasks to complex workflows.
+
+## ADK: Style Guides
+
+### Python Style Guide
+
+The project follows the Google Python Style Guide. Key conventions are enforced using `pylint` with the provided `pylintrc` configuration file. Here are some of the key style points:
+
+*   **Indentation**: 2 spaces.
+*   **Line Length**: Maximum 80 characters.
+*   **Naming Conventions**:
+    *   `function_and_variable_names`: `snake_case`
+    *   `ClassNames`: `CamelCase`
+    *   `CONSTANTS`: `UPPERCASE_SNAKE_CASE`
+*   **Docstrings**: Required for all public modules, functions, classes, and methods.
+*   **Imports**: Organized and sorted.
+*   **Error Handling**: Specific exceptions should be caught, not general ones like `Exception`.
+
+### Autoformat
+
+We have autoformat.sh to help solve import organize and formatting issues.
+
+```bash
+# Run in open_source_workspace/
+$ ./autoformat.sh
+```
+
+### In ADK source
+
+Below styles applies to the ADK source code (under `src/` folder of the Github.
+repo).
+
+#### Use relative imports
+
+```python
+# DO
+from ..agents.llm_agent import LlmAgent
+
+# DON'T
+from google.adk.agents.llm_agent import LlmAgent
+```
+
+#### Import from module, not from `__init__.py`
+
+```python
+# DO
+from ..agents.llm_agent import LlmAgent
+
+# DON'T
+from ..agents  import LlmAgent # import from agents/__init__.py
+```
+
+#### Always do `from __future__ import annotations`
+
+```python
+# DO THIS, right after the open-source header.
+from __future__ import annotations
+```
+
+Like below:
+
+```python
+# Copyright 2025 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
+
+# ... the rest of the file.
+```
+
+This allows us to forward-reference a class without quotes.
+
+Check out go/pep563 for details.
+
+### In ADK tests
+
+#### Use absolute imports
+
+In tests, we use `google.adk` same as how our users uses.
+
+```python
+# DO
+from google.adk.agents.llm_agent import LlmAgent
+
+# DON'T
+from ..agents.llm_agent import LlmAgent
+```
+
+## ADK: Local testing
+
+### Unit tests
+
+Run below command:
+
+```bash
+$ pytest tests/unittests
+```

CONTRIBUTING.md

@@ -49,6 +49,7 @@ This project follows
 
 ## Requirement for PRs
 
+- Each PR should only have one commit. Please squash it if there are multiple PRs.
 - All PRs, other than small documentation or typo fixes, should have a Issue assoicated. If not, please create one.
 - Small, focused PRs. Keep changes minimal—one concern per PR.
 - For bug fixes or features, please provide logs or screenshot after the fix is applied to help reviewers better understand the fix.
@@ -147,11 +148,11 @@ For any changes that impact user-facing documentation (guides, API reference, tu
     pytest ./tests/unittests
     ```
 
-    NOTE: for accurately repro test failure, only include `test` and `eval` as
-    extra dependencies.
+    NOTE: for accurate repro of test failure, only include `test`, `eval` and 
+    `a2a` as extra dependencies.
 
     ```shell
-    uv sync --extra test --extra eval
+    uv sync --extra test --extra eval --extra a2a
     pytest ./tests/unittests
     ```