Merge branch 'main' into firestore

Author: rohityan

.github/workflows/gemini-dispatch.yml

@@ -7,14 +7,6 @@ on:
   pull_request_review:
     types:
       - 'submitted'
-  pull_request:
-    types:
-      - 'opened'
-      - 'ready_for_review'
-  issues:
-    types:
-      - 'opened'
-      - 'reopened'
   issue_comment:
     types:
       - 'created'
@@ -44,19 +36,11 @@ jobs:
           env | grep '^DEBUG_'
 
   dispatch:
-    # For PRs: only if not from a fork
-    # For issues: only on open/reopen
-    # For comments: only if user types @gemini-cli and is OWNER/MEMBER/COLLABORATOR
+    # Only trigger if user types @gemini-cli and author association is OWNER, MEMBER, or COLLABORATOR
     if: |-
-      (
-        github.event_name == 'pull_request' &&
-        github.event.pull_request.head.repo.fork == false &&
-        github.event.pull_request.draft == false
-      ) || (
-        github.event.sender.type == 'User' &&
-        startsWith(github.event.comment.body || github.event.review.body || github.event.issue.body, '@gemini-cli') &&
-        contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association || github.event.review.author_association || github.event.issue.author_association)
-      )
+      github.event.sender.type == 'User' &&
+      startsWith(github.event.comment.body || github.event.review.body, '@gemini-cli') &&
+      contains(fromJSON('["OWNER", "MEMBER", "COLLABORATOR"]'), github.event.comment.author_association || github.event.review.author_association)
     runs-on: 'ubuntu-latest'
     permissions:
       contents: 'read'
@@ -82,22 +66,43 @@ jobs:
 
       - name: 'Extract command'
         id: 'extract_command'
-        uses: 'actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea' # ratchet:actions/github-script@v7
+        uses: 'actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd' # ratchet:actions/github-script@v8.0.0
         env:
-          EVENT_TYPE: '${{ github.event_name }}.${{ github.event.action }}'
-          REQUEST: '${{ github.event.comment.body || github.event.review.body || github.event.issue.body }}'
+          REQUEST: '${{ github.event.comment.body || github.event.review.body }}'
+          IS_PR: '${{ !!(github.event.pull_request || github.event.issue.pull_request) }}'
         with:
           script: |
-            const eventType = process.env.EVENT_TYPE;
             const request = process.env.REQUEST;
+            const isPr = process.env.IS_PR === 'true';
             core.setOutput('request', request);
 
-            if (eventType === 'pull_request.opened' || eventType === 'pull_request.ready_for_review') {
-              core.setOutput('command', 'review');
-            } else if (request.startsWith("@gemini-cli /review")) {
-              core.setOutput('command', 'review');
-              const additionalContext = request.replace(/^@gemini-cli \/review/, '').trim();
-              core.setOutput('additional_context', additionalContext);
+            // Ensure request is on a PR targeting the main branch
+            let baseRef = '';
+            if (context.eventName === 'pull_request_review' || context.eventName === 'pull_request_review_comment') {
+              baseRef = context.payload.pull_request.base.ref;
+            } else if (context.eventName === 'issue_comment' && context.payload.issue.pull_request) {
+              const pr = await github.rest.pulls.get({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: context.payload.issue.number
+              });
+              baseRef = pr.data.base.ref;
+            }
+
+            if (isPr && baseRef !== 'main') {
+              console.log(`Skipping: PR targets '${baseRef}', but only 'main' is allowed.`);
+              core.setOutput('command', 'fallthrough');
+              return;
+            }
+
+            if (request.startsWith("@gemini-cli /review")) {
+              if (isPr) {
+                core.setOutput('command', 'review');
+                const additionalContext = request.replace(/^@gemini-cli \/review/, '').trim();
+                core.setOutput('additional_context', additionalContext);
+              } else {
+                core.setOutput('command', 'fallthrough');
+              }
             } else if (request.startsWith("@gemini-cli")) {
               const additionalContext = request.replace(/^@gemini-cli/, '').trim();
               core.setOutput('command', 'invoke');

.github/workflows/gemini-invoke.yml

@@ -52,12 +52,14 @@ jobs:
           ISSUE_NUMBER: '${{ github.event.pull_request.number || github.event.issue.number }}'
           REPOSITORY: '${{ github.repository }}'
           ADDITIONAL_CONTEXT: '${{ inputs.additional_context }}'
+          # Required to allow the Gemini CLI to process files in the ephemeral GitHub Actions runner
+          GEMINI_CLI_TRUST_WORKSPACE: 'true'
         with:
           gcp_location: '${{ vars.GOOGLE_CLOUD_LOCATION }}'
           gcp_project_id: '${{ vars.GOOGLE_CLOUD_PROJECT }}'
           gcp_service_account: '${{ vars.SERVICE_ACCOUNT_EMAIL }}'
           gcp_workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}'
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
+          gemini_api_key: '${{ secrets.GOOGLE_API_KEY }}'
           gemini_cli_version: '${{ vars.GEMINI_CLI_VERSION }}'
           gemini_debug: '${{ fromJSON(vars.GEMINI_DEBUG || vars.ACTIONS_STEP_DEBUG || false) }}'
           gemini_model: '${{ vars.GEMINI_MODEL }}'
@@ -91,32 +93,12 @@ jobs:
                     "GITHUB_PERSONAL_ACCESS_TOKEN",
                     "ghcr.io/github/github-mcp-server:v0.27.0"
                   ],
-                  "includeTools": [
-                    "add_issue_comment",
-                    "issue_read",
-                    "list_issues",
-                    "search_issues",
-                    "pull_request_read",
-                    "list_pull_requests",
-                    "search_pull_requests",
-                    "get_commit",
-                    "get_file_contents",
-                    "list_commits",
-                    "search_code"
-                  ],
                   "env": {
                     "GITHUB_PERSONAL_ACCESS_TOKEN": "${{ steps.mint_identity_token.outputs.token || secrets.GITHUB_TOKEN || github.token }}"
                   }
                 }
-              },
-              "tools": {
-                "core": [
-                  "run_shell_command(cat)",
-                  "run_shell_command(echo)",
-                  "run_shell_command(grep)",
-                  "run_shell_command(head)",
-                  "run_shell_command(tail)"
-                ]
               }
             }
-          prompt: '/gemini-invoke'
+          prompt: |-
+            /gemini-invoke
+            [IMPORTANT] Do not generate execution plans and do not ask for approval (such as suggesting `@gemini-cli /approve`). Perform the requested task or answer the question directly and immediately.

.github/workflows/gemini-review.yml

@@ -51,14 +51,15 @@ jobs:
           PULL_REQUEST_NUMBER: '${{ github.event.pull_request.number || github.event.issue.number }}'
           REPOSITORY: '${{ github.repository }}'
           ADDITIONAL_CONTEXT: '${{ inputs.additional_context }}'
-          GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          GEMINI_API_KEY: '${{ secrets.GOOGLE_API_KEY }}'
+          # Required to allow the Gemini CLI to process files in the ephemeral GitHub Actions runner
           GEMINI_CLI_TRUST_WORKSPACE: 'true'
         with:
           gcp_location: '${{ vars.GOOGLE_CLOUD_LOCATION }}'
           gcp_project_id: '${{ vars.GOOGLE_CLOUD_PROJECT }}'
           gcp_service_account: '${{ vars.SERVICE_ACCOUNT_EMAIL }}'
           gcp_workload_identity_provider: '${{ vars.GCP_WIF_PROVIDER }}'
-          gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
+          gemini_api_key: '${{ secrets.GOOGLE_API_KEY }}'
           gemini_cli_version: '${{ vars.GEMINI_CLI_VERSION }}'
           gemini_debug: '${{ fromJSON(vars.GEMINI_DEBUG || vars.ACTIONS_STEP_DEBUG || false) }}'
           gemini_model: '${{ vars.GEMINI_MODEL }}'
@@ -90,11 +91,6 @@ jobs:
                     "GITHUB_PERSONAL_ACCESS_TOKEN",
                     "ghcr.io/github/github-mcp-server:v0.27.0"
                   ],
-                  "includeTools": [
-                    "pull_request_read",
-                    "add_comment_to_pending_review",
-                    "pull_request_review_write"
-                  ],
                   "env": {
                     "GITHUB_PERSONAL_ACCESS_TOKEN": "${{ steps.mint_identity_token.outputs.token || secrets.GITHUB_TOKEN || github.token }}"
                   }

contributing/samples/gcp_skill_registry_agent/__init__.py

@@ -0,0 +1,15 @@
+# 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.
+# 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 . import agent

contributing/samples/gcp_skill_registry_agent/agent.py

@@ -0,0 +1,40 @@
+# 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.
+# 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.
+
+"""Sample agent demonstrating the use of GCPSkillRegistry."""
+
+from google.adk import Agent
+from google.adk.integrations.skill_registry import GCPSkillRegistry
+from google.adk.tools.skill_toolset import SkillToolset
+
+# Initialize GCP Skill Registry
+registry = GCPSkillRegistry(
+    project_id="your-project-id", location="us-central1"
+)
+
+# Initialize SkillToolset with registry
+skill_toolset = SkillToolset(skills=[], registry=registry)
+
+root_agent = Agent(
+    model="gemini-2.5-flash",
+    name="skill_registry_agent",
+    description=(
+        "An agent that can discover and load skills from GCP Skill Registry."
+    ),
+    instruction=(
+        "Use search_skills to find skills and load_skill to load them if"
+        " needed."
+    ),
+    tools=[skill_toolset],
+)

pyproject.toml

@@ -166,7 +166,7 @@ scripts.adk = "google.adk.cli:main"
 
 [tool.flit.sdist]
 include = [ 'src/**/*', 'README.md', 'pyproject.toml', 'LICENSE' ]
-exclude = [ 'src/**/*.sh' ]
+exclude = [ 'src/**/*.sh', 'src/**/README.md' ]
 
 [tool.flit.module]
 name = "google.adk"

src/google/adk/a2a/utils/agent_to_a2a.py

@@ -35,6 +35,7 @@
 from ...runners import Runner
 from ...sessions.in_memory_session_service import InMemorySessionService
 from ..executor.a2a_agent_executor import A2aAgentExecutor
+from ..executor.config import A2aAgentExecutorConfig
 from ..experimental import a2a_experimental
 from .agent_card_builder import AgentCardBuilder
 
@@ -86,6 +87,7 @@ def to_a2a(
     task_store: TaskStore | None = None,
     runner: Runner | None = None,
     lifespan: Callable[[Starlette], AsyncIterator[None]] | None = None,
+    agent_executor_factory: Callable[[Runner], A2aAgentExecutor] | None = None,
 ) -> Starlette:
   """Convert an ADK agent to a A2A Starlette application.
 
@@ -95,20 +97,21 @@ def to_a2a(
       port: The port for the A2A RPC URL (default: 8000)
       protocol: The protocol for the A2A RPC URL (default: "http")
       agent_card: Optional pre-built AgentCard object or path to agent card
-                  JSON. If not provided, will be built automatically from the
-                  agent.
+        JSON. If not provided, will be built automatically from the agent.
       push_config_store: Optional A2A push notification config store. If not
-        provided, an in-memory store will be created so push-notification
-        config RPC methods are supported.
+        provided, an in-memory store will be created so push-notification config
+        RPC methods are supported.
       task_store: Optional A2A task store for persisting task state. If not
         provided, an in-memory store will be created.
       runner: Optional pre-built Runner object. If not provided, a default
-              runner will be created using in-memory services.
-      lifespan: Optional async context manager for Starlette lifespan
-        events. Use this to run startup/shutdown logic (e.g. initializing
-        database connections or loading resources). The context manager
-        receives the Starlette app instance and can set state on
-        ``app.state``.
+        runner will be created using in-memory services.
+      lifespan: Optional async context manager for Starlette lifespan events.
+        Use this to run startup/shutdown logic (e.g. initializing database
+        connections or loading resources). The context manager receives the
+        Starlette app instance and can set state on ``app.state``.
+      agent_executor_factory: Optional factory function that creates an instance
+        of A2aAgentExecutor. If not provided, a default A2aAgentExecutor will be
+        created.
 
   Returns:
       A Starlette application that can be run with uvicorn
@@ -148,7 +151,7 @@ async def lifespan(app):
   adk_logger = logging.getLogger("google_adk")
   adk_logger.setLevel(logging.INFO)
 
-  async def create_runner() -> Runner:
+  def create_runner() -> Runner:
     """Create a runner for the agent."""
     return Runner(
         app_name=agent.name or "adk_agent",
@@ -164,8 +167,10 @@ async def create_runner() -> Runner:
   if task_store is None:
     task_store = InMemoryTaskStore()
 
-  agent_executor = A2aAgentExecutor(
-      runner=runner or create_runner,
+  agent_executor = (
+      agent_executor_factory(runner or create_runner())
+      if agent_executor_factory is not None
+      else A2aAgentExecutor(runner=runner or create_runner)
   )
 
   if push_config_store is None:

src/google/adk/evaluation/simulation/per_turn_user_simulator_quality_v1.py

@@ -325,6 +325,10 @@ async def _evaluate_intermediate_turn(
         previous_invocations=invocation_history,
     )
 
+    config = (
+        self._llm_options.judge_model_config
+        or genai_types.GenerateContentConfig()
+    )
     llm_request = LlmRequest(
         model=self._llm_options.judge_model,
         contents=[
@@ -333,7 +337,7 @@ async def _evaluate_intermediate_turn(
                 role="user",
             )
         ],
-        config=self._llm_options.judge_model_config,
+        config=config,
     )
     add_default_retry_options_if_not_present(llm_request)
     num_samples = self._llm_options.num_samples

src/google/adk/integrations/skill_registry/__init__.py

@@ -0,0 +1,19 @@
+# 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.
+# 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.
+
+"""Skill Registry integrations."""
+
+from .gcp_skill_registry import GCPSkillRegistry
+
+__all__ = ["GCPSkillRegistry"]