Merge branch 'main' into feat/skill-rolling-window-clean

rohityan · web-flow · commit a5b2c7686ae1 · 2026-05-20T16:16:37.000-07:00
diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "2.0.0-beta.1"
+  ".": "2.0.0"
 }
diff --git a/.github/release-please-config.json b/.github/release-please-config.json
@@ -56,5 +56,5 @@
       ]
     }
   },
-  "last-release-sha": "81a15a5229564c1448f79c75c0fc86218aebc1a2"
+  "last-release-sha": "e6537decc910d64a31e6646064e8290b02af4511"
 }
diff --git a/.github/workflows/analyze-releases-for-adk-docs-updates.yml b/.github/workflows/analyze-releases-for-adk-docs-updates.yml
@@ -51,7 +51,7 @@ jobs:
         if: ${{ github.event.inputs.resume == 'true' }}
         uses: actions/cache/restore@v4
         with:
-          path: contributing/samples/adk_documentation/adk_release_analyzer/sessions.db
+          path: contributing/samples/adk_team/adk_documentation/adk_release_analyzer/sessions.db
           key: analyzer-session-db
 
       - name: Run Analyzing Script
@@ -64,9 +64,9 @@ jobs:
           DOC_REPO: 'adk-docs'
           CODE_REPO: 'adk-python'
           INTERACTIVE: 0
-          PYTHONPATH: contributing/samples/adk_documentation
+          PYTHONPATH: contributing/samples/adk_team
         run: >-
-          python -m adk_release_analyzer.main
+          python -m adk_documentation.adk_release_analyzer.main
           ${{ github.event.inputs.resume == 'true' && '--resume' || '' }}
           ${{ github.event.inputs.start_tag && format('--start-tag {0}', github.event.inputs.start_tag) || '' }}
           ${{ github.event.inputs.end_tag && format('--end-tag {0}', github.event.inputs.end_tag) || '' }}
@@ -75,5 +75,5 @@ jobs:
         if: always()
         uses: actions/cache/save@v4
         with:
-          path: contributing/samples/adk_documentation/adk_release_analyzer/sessions.db
+          path: contributing/samples/adk_team/adk_documentation/adk_release_analyzer/sessions.db
           key: analyzer-session-db
diff --git a/.github/workflows/discussion_answering.yml b/.github/workflows/discussion_answering.yml
@@ -48,7 +48,7 @@ jobs:
           OWNER: 'google'
           REPO: 'adk-python'
           INTERACTIVE: 0
-          PYTHONPATH: contributing/samples
+          PYTHONPATH: contributing/samples/adk_team
         run: |
           # Write discussion data to temporary file to avoid secret masking issues
           cat > /tmp/discussion.json << 'EOF'
diff --git a/.github/workflows/issue-monitor.yml b/.github/workflows/issue-monitor.yml
@@ -59,5 +59,5 @@ jobs:
           CONCURRENCY_LIMIT: 3
           INITIAL_FULL_SCAN: ${{ github.event.inputs.full_scan == 'true' }}
           LLM_MODEL_NAME: "gemini-2.5-flash"
-          PYTHONPATH: contributing/samples
+          PYTHONPATH: contributing/samples/adk_team
         run: python -m adk_issue_monitoring_agent.main
diff --git a/.github/workflows/pr-triage.yml b/.github/workflows/pr-triage.yml
@@ -41,5 +41,5 @@ jobs:
           REPO: 'adk-python'
           PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number || github.event.inputs.pr_number }}
           INTERACTIVE: ${{ vars.PR_TRIAGE_INTERACTIVE }}
-          PYTHONPATH: contributing/samples
+          PYTHONPATH: contributing/samples/adk_team
         run: python -m adk_pr_triaging_agent.main
diff --git a/.github/workflows/stale-bot.yml b/.github/workflows/stale-bot.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install requests google-adk
+          pip install requests google-adk python-dateutil
 
       - name: Run Auditor Agent Script
         env:
@@ -39,6 +39,6 @@ jobs:
           REPO: adk-python
           CONCURRENCY_LIMIT: 3
           LLM_MODEL_NAME: "gemini-2.5-flash"
-          PYTHONPATH: contributing/samples
+          PYTHONPATH: contributing/samples/adk_team
 
         run: python -m adk_stale_agent.main
diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
@@ -50,5 +50,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
-          PYTHONPATH: contributing/samples
+          PYTHONPATH: contributing/samples/adk_team
         run: python -m adk_triaging_agent.main
diff --git a/.github/workflows/upload-adk-docs-to-vertex-ai-search.yml b/.github/workflows/upload-adk-docs-to-vertex-ai-search.yml
@@ -51,5 +51,5 @@ jobs:
           GCS_BUCKET_NAME: ${{ secrets.GCS_BUCKET_NAME }}
           ADK_DOCS_ROOT_PATH: /tmp/adk-docs
           ADK_PYTHON_ROOT_PATH: /tmp/adk-python
-          PYTHONPATH: contributing/samples
+          PYTHONPATH: contributing/samples/adk_team
         run: python -m adk_answering_agent.upload_docs_to_vertex_ai_search
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.0.0](https://github.com/google/adk-python/compare/v2.0.0b1...v2.0.0) (2026-05-19)
+
+### ADK 2.0 General Availability
+
+This release introduces v2.0.0 General Availability (GA) of the Google Agent Development Kit (ADK), establishing production-grade foundations for multi-agent workflows and advanced dynamic agent collaboration.
+
+### Core Architecture Highlights
+
+#### Multi-Agent Workflow Engine
+* **Flexible Execution Graphs:** Establishes a model-agnostic engine for orchestrating non-linear, conditional, and cyclical agent execution patterns.
+* **Intelligent Task Delegation:** Introduces modular workflow abstractions enabling parallel sub-agent workers, nested hierarchical team structures, and resilient dynamic scheduling across complex task execution steps.
+
+#### Dynamic Agent Collaboration
+* **Native Inter-Agent Routing:** Provides seamless orchestration for inter-agent messaging, control state handoffs, and context variable propagation across collaborative multi-agent flows.
+
 ## [1.34.0](https://github.com/google/adk-python/compare/v1.33.0...v1.34.0) (2026-05-18)
 
 
diff --git a/contributing/samples/adk_team/adk_answering_agent/agent.py b/contributing/samples/adk_team/adk_answering_agent/agent.py
@@ -38,7 +38,7 @@
 
 
 root_agent = Agent(
-    model="gemini-2.5-pro",
+    model="gemini-3.5-flash",
     name="adk_answering_agent",
     description="Answer questions about ADK repo.",
     instruction=f"""
diff --git a/contributing/samples/adk_team/adk_answering_agent/gemini_assistant/agent.py b/contributing/samples/adk_team/adk_answering_agent/gemini_assistant/agent.py
@@ -72,7 +72,7 @@ def search_gemini_api_docs(queries: List[str]) -> Dict[str, Any]:
 
 
 root_agent = Agent(
-    model="gemini-2.5-pro",
+    model="gemini-3.5-flash",
     name="gemini_assistant",
     description="Answer questions about Gemini API.",
     instruction="""
diff --git a/contributing/samples/adk_team/adk_documentation/adk_docs_updater/agent.py b/contributing/samples/adk_team/adk_documentation/adk_docs_updater/agent.py
@@ -46,7 +46,7 @@
   )
 
 root_agent = Agent(
-    model="gemini-2.5-pro",
+    model="gemini-3.5-flash",
     name="adk_docs_updater",
     description=(
         "Update the ADK docs based on the code in the ADK Python codebase"
diff --git a/contributing/samples/adk_team/adk_issue_formatting_agent/agent.py b/contributing/samples/adk_team/adk_issue_formatting_agent/agent.py
@@ -132,7 +132,7 @@ def list_comments_on_issue(issue_number: int) -> dict[str, any]:
 
 
 root_agent = Agent(
-    model="gemini-2.5-pro",
+    model="gemini-3.5-flash",
     name="adk_issue_formatting_assistant",
     description="Check ADK issue format and content.",
     instruction=f"""
diff --git a/contributing/samples/adk_team/adk_pr_triaging_agent/agent.py b/contributing/samples/adk_team/adk_pr_triaging_agent/agent.py
@@ -41,7 +41,7 @@
 ]
 
 CONTRIBUTING_MD = read_file(
-    Path(__file__).resolve().parents[3] / "CONTRIBUTING.md"
+    Path(__file__).resolve().parents[4] / "CONTRIBUTING.md"
 )
 
 APPROVAL_INSTRUCTION = (
@@ -220,7 +220,7 @@ def add_comment_to_pr(pr_number: int, comment: str) -> dict[str, Any]:
 
 
 root_agent = Agent(
-    model="gemini-2.5-pro",
+    model="gemini-3.5-flash",
     name="adk_pr_triaging_assistant",
     description="Triage ADK pull requests.",
     instruction=f"""
diff --git a/contributing/samples/adk_team/adk_triaging_agent/agent.py b/contributing/samples/adk_team/adk_triaging_agent/agent.py
@@ -244,7 +244,7 @@ def change_issue_type(issue_number: int, issue_type: str) -> dict[str, Any]:
 
 
 root_agent = Agent(
-    model="gemini-2.5-pro",
+    model="gemini-3.5-flash",
     name="adk_triaging_assistant",
     description="Triage ADK issues.",
     instruction=f"""
diff --git a/contributing/samples/tools/parallel_functions/tests/test_all_tools.json b/contributing/samples/tools/parallel_functions/tests/test_all_tools.json
@@ -193,4 +193,4 @@
       }
     }
   ]
-}
+}
diff --git a/contributing/samples/tools/parallel_functions/tests/test_parallel_mixed.json b/contributing/samples/tools/parallel_functions/tests/test_parallel_mixed.json
@@ -125,4 +125,4 @@
       }
     }
   ]
-}
+}
diff --git a/contributing/samples/tools/parallel_functions/tests/test_parallel_weather.json b/contributing/samples/tools/parallel_functions/tests/test_parallel_weather.json
@@ -126,4 +126,4 @@
       }
     }
   ]
-}
+}
diff --git a/contributing/samples/tools/pydantic_argument/tests/test_create_company.json b/contributing/samples/tools/pydantic_argument/tests/test_create_company.json
@@ -136,4 +136,4 @@
       }
     }
   ]
-}
+}
diff --git a/contributing/samples/tools/pydantic_argument/tests/test_create_user.json b/contributing/samples/tools/pydantic_argument/tests/test_create_user.json
@@ -101,4 +101,4 @@
       }
     }
   ]
-}
+}
diff --git a/contributing/samples/tools/pydantic_argument/tests/test_create_user_with_prefs.json b/contributing/samples/tools/pydantic_argument/tests/test_create_user_with_prefs.json
@@ -104,4 +104,4 @@
       }
     }
   ]
-}
+}
diff --git a/pyproject.toml b/pyproject.toml
@@ -76,6 +76,7 @@ optional-dependencies.all = [
   "google-cloud-dataplex>=1.7,<3",
   "google-cloud-discoveryengine>=0.13.12,<0.14",
   "google-cloud-pubsub>=2,<3",
+  "google-cloud-resource-manager>=1.12,<2",
   "google-cloud-secret-manager>=2.22,<3",
   "google-cloud-spanner>=3.56,<4",
   "google-cloud-speech>=2.30,<3",
@@ -155,6 +156,7 @@ optional-dependencies.gcp = [
   "google-cloud-dataplex>=1.7,<3",
   "google-cloud-discoveryengine>=0.13.12,<0.14",
   "google-cloud-pubsub>=2,<3",
+  "google-cloud-resource-manager>=1.12,<2",
   "google-cloud-secret-manager>=2.22,<3",
   "google-cloud-spanner>=3.56,<4",
   "google-cloud-speech>=2.30,<3",
@@ -192,6 +194,7 @@ optional-dependencies.test = [
   "google-cloud-iamconnectorcredentials>=0.1,<0.2",
   "google-cloud-parametermanager>=0.4,<1",
   "google-cloud-pubsub>=2,<3",
+  "google-cloud-resource-manager>=1.12,<2",
   "google-cloud-secret-manager>=2.22,<3",
   "google-cloud-spanner>=3.56,<4",
   "google-cloud-speech>=2.30,<3",
diff --git a/src/google/adk/cli/agent_test_runner.py b/src/google/adk/cli/agent_test_runner.py
@@ -881,6 +881,7 @@ def get_next_fc_id():
       # Write back to file
       with open(test_file, "w") as f:
         json.dump(session_data, f, indent=2, sort_keys=True)
+        f.write("\n")
 
       print(f"Successfully rebuilt {test_file}")
 
diff --git a/src/google/adk/cli/browser/assets/config/runtime-config.json b/src/google/adk/cli/browser/assets/config/runtime-config.json
@@ -1,3 +1,3 @@
 {
   "backendUrl": ""
-}
+}
diff --git a/src/google/adk/cli/utils/_onboarding.py b/src/google/adk/cli/utils/_onboarding.py
@@ -182,7 +182,12 @@ def handle_login_with_google() -> VertexAIAuth | ExpressModeAuth:
       )
 
   # Check for existing full GCP projects
-  projects = gcp_utils.list_gcp_projects(limit=20)
+  try:
+    projects = gcp_utils.list_gcp_projects(limit=20)
+  except RuntimeError as e:
+    click.secho(str(e), fg="yellow")
+    projects = []
+
   if projects:
     click.secho("Recently created Google Cloud projects found:", fg="green")
     click.echo("0. Enter project ID manually")
diff --git a/src/google/adk/cli/utils/gcp_utils.py b/src/google/adk/cli/utils/gcp_utils.py
@@ -27,7 +27,6 @@
 import google.auth.exceptions
 from google.auth.transport.requests import AuthorizedSession
 from google.auth.transport.requests import Request
-from google.cloud import resourcemanager_v3
 import requests
 
 _VERTEX_AI_ENDPOINT = "https://{location}-aiplatform.googleapis.com/v1beta1"
@@ -161,6 +160,14 @@ def list_gcp_projects(limit: int = 20) -> List[Tuple[str, str]]:
   Returns:
     A list of (project_id, name) tuples.
   """
+  try:
+    from google.cloud import resourcemanager_v3
+  except ImportError as e:
+    raise RuntimeError(
+        "Listing GCP projects requires the 'gcp' optional dependency. "
+        "Please install 'google-adk[gcp]' or 'google-cloud-resource-manager'."
+    ) from e
+
   try:
     client = resourcemanager_v3.ProjectsClient()
     search_results = client.search_projects()
diff --git a/src/google/adk/version.py b/src/google/adk/version.py
@@ -13,4 +13,4 @@
 # limitations under the License.
 
 # version: major.minor.patch
-__version__ = "2.0.0b1"
+__version__ = "2.0.0"
diff --git a/src/google/adk/workflow/_node_runner.py b/src/google/adk/workflow/_node_runner.py
@@ -285,11 +285,16 @@ def _track_event_in_context(self, event: Event, ctx: Context) -> None:
       ctx.output = event.content
     if event.long_running_tool_ids is not None:
       ctx._interrupt_ids.update(event.long_running_tool_ids)
-    if event.actions.route is not None:
-      ctx.route = event.actions.route
-      ctx._route_emitted = True
-    if event.actions.transfer_to_agent is not None:
-      ctx.actions.transfer_to_agent = event.actions.transfer_to_agent
+    # Only propagate decisions from native events (authored by this node or unspecified).
+    # This prevents structured parent nodes (e.g. SequentialAgent) from intercepting
+    # and bubbling up actions already handled internally by their nested sub-agents.
+    is_native_node_event = not event.author or event.author == self._node.name
+    if event.actions and is_native_node_event:
+      if event.actions.route is not None:
+        ctx.route = event.actions.route
+        ctx._route_emitted = True
+      if event.actions.transfer_to_agent is not None:
+        ctx.actions.transfer_to_agent = event.actions.transfer_to_agent
 
     ctx.telemetry_context.add_event(event)
 
diff --git a/tests/unittests/cli/utils/test_gcp_utils.py b/tests/unittests/cli/utils/test_gcp_utils.py
@@ -141,7 +141,7 @@ def test_sign_up_express(self, mock_auth_default, mock_session_cls):
     )
 
   @mock.patch(
-      "google.adk.cli.utils.gcp_utils.resourcemanager_v3.ProjectsClient"
+      "google.cloud.resourcemanager_v3.ProjectsClient"
   )
   def test_list_gcp_projects(self, mock_client_cls):
     mock_client = mock.Mock()
@@ -162,6 +162,13 @@ def test_list_gcp_projects(self, mock_client_cls):
     self.assertEqual(projects[0], ("p1", "Project 1"))
     self.assertEqual(projects[1], ("p2", "p2"))
 
+  @mock.patch.dict("sys.modules", {"google.cloud": None})
+  def test_list_gcp_projects_import_error(self):
+    with self.assertRaisesRegex(
+        RuntimeError, "Listing GCP projects requires the 'gcp' optional dependency"
+    ):
+      gcp_utils.list_gcp_projects()
+
 
 if __name__ == "__main__":
   unittest.main()
diff --git a/tests/unittests/workflow/test_agent_transfer.py b/tests/unittests/workflow/test_agent_transfer.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- ".": "2.0.0-beta.1"`
	`2`	`+ ".": "2.0.0"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,5 +56,5 @@`
`56`	`56`	`]`
`57`	`57`	`}`
`58`	`58`	`},`
`59`		`- "last-release-sha": "81a15a5229564c1448f79c75c0fc86218aebc1a2"`
	`59`	`+ "last-release-sha": "e6537decc910d64a31e6646064e8290b02af4511"`
`60`	`60`	`}`