Merge branch 'main' into fix/issue-span-attributes

Author: DineshThumma9

.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.

CHANGELOG.md

@@ -5,11 +5,11 @@
 ### ⚠ BREAKING CHANGES
 
 * Breaking: Use OpenTelemetry for BigQuery plugin tracing, replacing custom `ContextVar` implementation ([ab89d12](https://github.com/google/adk-python/commit/ab89d1283430041afb303834749869e9ee331721))
-* Add support to automatically create a session if one does not exist ([8e69a58](https://github.com/google/adk-python/commit/8e69a58df4eadeccbb100b7264bb518a46b61fd7))
 
 ### Features
 
 * **[Core]**
+  * Add support to automatically create a session if one does not exist ([8e69a58](https://github.com/google/adk-python/commit/8e69a58df4eadeccbb100b7264bb518a46b61fd7))
   * Remove `@experimental` decorator from `AgentEngineSandboxCodeExecutor` ([135f763](https://github.com/google/adk-python/commit/135f7633253f6a415302142abc3579b664601d5b))
   * Add `--disable_features` CLI option to override default feature enable state ([53b67ce](https://github.com/google/adk-python/commit/53b67ce6340f3f3f8c3d732f9f7811e445c76359))
   * Add `otel_to_cloud` flag to `adk deploy agent_engine` command ([21f63f6](https://github.com/google/adk-python/commit/21f63f66ee424501d9a70806277463ef718ae843))

CONTRIBUTING.md

@@ -188,6 +188,18 @@ part before or alongside your code PR.
     pytest ./tests/unittests
     ```
 
+    **Alternatively**, use the included `unittests.sh` script which handles
+    environment setup and restoration automatically:
+
+    ```shell
+    ./scripts/unittests.sh
+    ```
+
+    This script will:
+    -   Set up the test environment with minimal dependencies (`test`, `eval`, `a2a`)
+    -   Run the unit tests
+    -   Restore the full development environment (`--all-extras`)
+
 6.  **Auto-format the code:**
 
     **NOTE**: We use `isort` and `pyink` for styles. Use the included

contributing/samples/adk_documentation/adk_release_analyzer/agent.py

@@ -272,6 +272,8 @@ def get_release_context(tool_context: ToolContext) -> dict[str, Any]:
 
 3. Call `get_changed_files_summary` to get the list of changed files WITHOUT
    the full patches (to save context space).
+   - **IMPORTANT**: Pass `local_repo_path="{LOCAL_REPOS_DIR_PATH}/{CODE_REPO}"`
+     to use local git and avoid GitHub API's 300-file limit.
 
 4. Filter and organize the files:
    - **INCLUDE** only files in `src/google/adk/` directory

contributing/samples/adk_documentation/tools.py

@@ -600,23 +600,37 @@ def get_file_diff_for_release(
 
 
 def get_changed_files_summary(
-    repo_owner: str, repo_name: str, start_tag: str, end_tag: str
+    repo_owner: str,
+    repo_name: str,
+    start_tag: str,
+    end_tag: str,
+    local_repo_path: Optional[str] = None,
 ) -> Dict[str, Any]:
   """Gets a summary of changed files between two releases without patches.
 
-  This is a lighter-weight version of get_changed_files_between_releases
-  that only returns file paths and metadata, without the actual diff content.
-  Use this for planning which files to analyze.
+  This function uses local git commands when local_repo_path is provided,
+  which avoids the GitHub API's 300-file limit for large comparisons.
+  Falls back to GitHub API if local_repo_path is not provided or invalid.
 
   Args:
       repo_owner: The name of the repository owner.
       repo_name: The name of the repository.
       start_tag: The older tag (base) for the comparison.
       end_tag: The newer tag (head) for the comparison.
+      local_repo_path: Optional absolute path to local git repo. If provided
+          and valid, uses git diff instead of GitHub API to get complete
+          file list (avoids 300-file limit).
 
   Returns:
       A dictionary containing the status and a summary of changed files.
   """
+  # Use local git if valid path is provided (avoids GitHub API 300-file limit)
+  if local_repo_path and os.path.isdir(os.path.join(local_repo_path, ".git")):
+    return _get_changed_files_from_local_git(
+        local_repo_path, start_tag, end_tag, repo_owner, repo_name
+    )
+
+  # Fall back to GitHub API (limited to 300 files)
   url = f"{GITHUB_BASE_URL}/repos/{repo_owner}/{repo_name}/compare/{start_tag}...{end_tag}"
 
   try:
@@ -654,8 +668,140 @@ def get_changed_files_summary(
             f"https://github.com/{repo_owner}/{repo_name}"
             f"/compare/{start_tag}...{end_tag}"
         ),
+        "note": (
+            (
+                "Using GitHub API which is limited to 300 files. "
+                "Provide local_repo_path to get complete file list."
+            )
+            if len(formatted_files) >= 300
+            else None
+        ),
     }
   except requests.exceptions.HTTPError as e:
     return error_response(f"HTTP Error: {e}")
   except requests.exceptions.RequestException as e:
     return error_response(f"Request Error: {e}")
+
+
+def _get_changed_files_from_local_git(
+    local_repo_path: str,
+    start_tag: str,
+    end_tag: str,
+    repo_owner: str,
+    repo_name: str,
+) -> Dict[str, Any]:
+  """Gets changed files using local git commands (no file limit).
+
+  Args:
+      local_repo_path: Path to local git repository.
+      start_tag: The older tag (base) for the comparison.
+      end_tag: The newer tag (head) for the comparison.
+      repo_owner: Repository owner for compare URL.
+      repo_name: Repository name for compare URL.
+
+  Returns:
+      A dictionary containing the status and a summary of changed files.
+  """
+  try:
+    # Fetch tags to ensure we have them
+    subprocess.run(
+        ["git", "fetch", "--tags"],
+        cwd=local_repo_path,
+        capture_output=True,
+        text=True,
+        check=False,
+    )
+
+    # Get list of changed files with their status
+    diff_result = subprocess.run(
+        ["git", "diff", "--name-status", f"{start_tag}...{end_tag}"],
+        cwd=local_repo_path,
+        capture_output=True,
+        text=True,
+        check=True,
+    )
+
+    # Get numstat for additions/deletions
+    numstat_result = subprocess.run(
+        ["git", "diff", "--numstat", f"{start_tag}...{end_tag}"],
+        cwd=local_repo_path,
+        capture_output=True,
+        text=True,
+        check=True,
+    )
+
+    # Parse numstat output (additions, deletions, filename)
+    file_stats: Dict[str, Dict[str, int]] = {}
+    for line in numstat_result.stdout.strip().split("\n"):
+      if not line:
+        continue
+      parts = line.split("\t")
+      if len(parts) >= 3:
+        additions = int(parts[0]) if parts[0] != "-" else 0
+        deletions = int(parts[1]) if parts[1] != "-" else 0
+        filename = parts[2]
+        file_stats[filename] = {
+            "additions": additions,
+            "deletions": deletions,
+            "changes": additions + deletions,
+        }
+
+    # Parse name-status output and combine with numstat
+    status_map = {
+        "A": "added",
+        "D": "removed",
+        "M": "modified",
+        "R": "renamed",
+        "C": "copied",
+    }
+
+    files_by_dir: Dict[str, List[Dict[str, Any]]] = {}
+    formatted_files = []
+
+    for line in diff_result.stdout.strip().split("\n"):
+      if not line:
+        continue
+      parts = line.split("\t")
+      if len(parts) >= 2:
+        status_code = parts[0][0]  # First char is the status
+        filename = parts[-1]  # Last part is filename (handles renames)
+
+        stats = file_stats.get(
+            filename,
+            {
+                "additions": 0,
+                "deletions": 0,
+                "changes": 0,
+            },
+        )
+
+        file_info = {
+            "relative_path": filename,
+            "status": status_map.get(status_code, "modified"),
+            "additions": stats["additions"],
+            "deletions": stats["deletions"],
+            "changes": stats["changes"],
+        }
+        formatted_files.append(file_info)
+
+        # Group by top-level directory
+        dir_parts = filename.split("/")
+        top_dir = dir_parts[0] if dir_parts else "root"
+        if top_dir not in files_by_dir:
+          files_by_dir[top_dir] = []
+        files_by_dir[top_dir].append(file_info)
+
+    return {
+        "status": "success",
+        "total_files": len(formatted_files),
+        "files": formatted_files,
+        "files_by_directory": files_by_dir,
+        "compare_url": (
+            f"https://github.com/{repo_owner}/{repo_name}"
+            f"/compare/{start_tag}...{end_tag}"
+        ),
+    }
+  except subprocess.CalledProcessError as e:
+    return error_response(f"Git command failed: {e.stderr}")
+  except (OSError, ValueError) as e:
+    return error_response(f"Error getting changed files: {e}")

contributing/samples/data_agent/README.md

@@ -37,10 +37,6 @@ questions in the same session, and the agent will maintain context.
 *   `get_data_agent_info`: Retrieves details about a specific Data Agent given
     its full resource name.
 *   `ask_data_agent`: Chats with a specific Data Agent using natural language.
-    This tool maintains conversation state: if you ask multiple
-    questions to the same agent in one session, it will use the same
-    conversation, allowing for follow-ups. If you switch agents, a new
-    conversation will be started for the new agent.
 
 ## How to Run
 

pyproject.toml

@@ -127,6 +127,7 @@ test = [
   "llama-index-readers-file>=0.4.0",              # For retrieval tests
   "openai>=1.100.2",                              # For LiteLLM
   "opentelemetry-instrumentation-google-genai>=0.3b0, <1.0.0",
+  "pypika>=0.50.0",                               # For crewai->chromadb dependency
   "pytest-asyncio>=0.25.0",
   "pytest-mock>=3.14.0",
   "pytest-xdist>=3.6.1",
@@ -158,6 +159,7 @@ extensions = [
   "llama-index-readers-file>=0.4.0",            # For retrieval using LlamaIndex.
   "llama-index-embeddings-google-genai>=0.3.0", # For files retrieval using LlamaIndex.
   "lxml>=5.3.0",                                # For load_web_page tool.
+  "pypika>=0.50.0",                             # For crewai->chromadb dependency
   "toolbox-adk>=0.5.7, <0.6.0",                 # For tools.toolbox_toolset.ToolboxToolset
 ]