Merge branch 'main' into security/restrict-module-imports-config-agent

Author: rohityan

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

@@ -111,7 +111,7 @@ jobs:
             # 1. Identify files containing any googleapis.com URL.
             set +e
             FILES_WITH_ENDPOINTS=$(grep -lE 'https?://[a-zA-Z0-9.-]+\.googleapis\.com' $CHANGED_FILES)
-            
+
             # 2. From those, identify files that are MISSING the required mTLS version.
             if [ -n "$FILES_WITH_ENDPOINTS" ]; then
               FILES_MISSING_MTLS=$(grep -L '.mtls.googleapis.com' $FILES_WITH_ENDPOINTS)

.github/workflows/issue-monitor.yml

@@ -58,6 +58,6 @@ jobs:
           REPO: ${{ github.event.repository.name }}
           CONCURRENCY_LIMIT: 3
           INITIAL_FULL_SCAN: ${{ github.event.inputs.full_scan == 'true' }}
-          LLM_MODEL_NAME: "gemini-2.5-flash"
+          LLM_MODEL_NAME: "gemini-3.5-flash"
           PYTHONPATH: contributing/samples/adk_team
         run: python -m adk_issue_monitoring_agent.main

.github/workflows/stale-bot.yml

@@ -38,7 +38,7 @@ jobs:
           OWNER: ${{ github.repository_owner }}
           REPO: adk-python
           CONCURRENCY_LIMIT: 3
-          LLM_MODEL_NAME: "gemini-2.5-flash"
+          LLM_MODEL_NAME: "gemini-3.5-flash"
           PYTHONPATH: contributing/samples/adk_team
 
         run: python -m adk_stale_agent.main

.gitignore

@@ -104,6 +104,7 @@ Thumbs.db
 .adk/
 .claude/
 .jetski*
+.antigravity*
 CLAUDE.md
 .cursor/
 .cursorrules

contributing/samples/integrations/data_agent/agent.py

@@ -79,6 +79,7 @@
     ],
 )
 
+
 # NOTE: The generate_chart tool requires 'altair' and 'vl-convert-python' to be
 # installed in your environment. You can install them using:
 # pip install altair vl-convert-python

src/google/adk/agents/llm_agent.py

@@ -193,7 +193,7 @@ async def _convert_tool_union_to_tools(
 class LlmAgent(BaseAgent):
   """LLM-based Agent."""
 
-  DEFAULT_MODEL: ClassVar[str] = 'gemini-2.5-flash'
+  DEFAULT_MODEL: ClassVar[str] = 'gemini-3-flash-preview'
   """System default model used when no model is set on an agent."""
 
   DEFAULT_LIVE_MODEL: ClassVar[str] = 'gemini-live-2.5-flash-native-audio'
@@ -210,7 +210,7 @@ class LlmAgent(BaseAgent):
 
   When not set, the agent will inherit the model from its ancestor. If no
   ancestor provides a model, the agent uses the default model configured via
-  LlmAgent.set_default_model. The built-in default is gemini-2.5-flash.
+  LlmAgent.set_default_model. The built-in default is gemini-3-flash-preview.
   """
 
   instruction: Union[str, InstructionProvider] = ''

src/google/adk/agents/llm_agent_config.py

@@ -55,10 +55,11 @@ class LlmAgentConfig(BaseAgentConfig):
       default=None,
       description=(
           'Optional. LlmAgent.model. Provide a model name string (e.g.'
-          ' "gemini-2.5-flash"). If not set, the model will be inherited from'
-          ' the ancestor or fall back to the system default (gemini-2.5-flash'
-          ' unless overridden via LlmAgent.set_default_model). To construct a'
-          ' model instance from code, use model_code.'
+          ' "gemini-3-flash-preview"). If not set, the model will be inherited'
+          ' from the ancestor or fall back to the system default'
+          ' (gemini-3-flash-preview unless overridden via'
+          ' LlmAgent.set_default_model). To construct a model instance from'
+          ' code, use model_code.'
       ),
   )
 

src/google/adk/cli/utils/evals.py

@@ -15,7 +15,8 @@
 from __future__ import annotations
 
 import os
-from typing import Any, TYPE_CHECKING
+from typing import Any
+from typing import TYPE_CHECKING
 
 from pydantic import alias_generators
 from pydantic import BaseModel
@@ -77,9 +78,9 @@ def create_gcs_eval_managers_from_uri(
       from ...evaluation.gcs_eval_sets_manager import GcsEvalSetsManager
     except ImportError as e:
       raise RuntimeError(
-          'GCS evaluation managers require Google Cloud optional dependencies.\n'
-          'Please install them using: pip install google-adk[gcp]\n'
-          'Or: pip install google-cloud-storage>=2.18'
+          'GCS evaluation managers require Google Cloud optional'
+          ' dependencies.\nPlease install them using: pip install'
+          ' google-adk[gcp]\nOr: pip install google-cloud-storage>=2.18'
       ) from e
 
     gcs_bucket = eval_storage_uri.split('://')[1]

src/google/adk/features/_feature_registry.py

@@ -150,7 +150,7 @@ class FeatureConfig:
         FeatureStage.EXPERIMENTAL, default_on=True
     ),
     FeatureName.SKILL_TOOLSET: FeatureConfig(
-        FeatureStage.EXPERIMENTAL, default_on=True
+        FeatureStage.STABLE, default_on=True
     ),
     FeatureName.SPANNER_ADMIN_TOOLSET: FeatureConfig(
         FeatureStage.EXPERIMENTAL, default_on=True

src/google/adk/runners.py

@@ -455,6 +455,7 @@ async def _run_node_async(
       user_id: str,
       session_id: str,
       new_message: Optional[types.Content] = None,
+      state_delta: Optional[dict[str, Any]] = None,
       run_config: Optional[RunConfig] = None,
       yield_user_message: bool = False,
       node: Optional['BaseNode'] = None,
@@ -512,7 +513,9 @@ async def _run_node_async(
 
       # Append user message to session for history
       if new_message:
-        user_event = await self._append_user_event(ic, new_message)
+        user_event = await self._append_user_event(
+            ic, new_message, state_delta=state_delta
+        )
         if yield_user_message and user_event:
           yield user_event
 
@@ -706,14 +709,26 @@ def _resolve_invocation_id_from_fr(
     return invocation_ids.pop()
 
   async def _append_user_event(
-      self, ic: InvocationContext, content: types.Content
+      self,
+      ic: InvocationContext,
+      content: types.Content,
+      *,
+      state_delta: Optional[dict[str, Any]] = None,
   ) -> Event:
     """Append a user message event to the session and return it."""
-    event = Event(
-        invocation_id=ic.invocation_id,
-        author='user',
-        content=content,
-    )
+    if state_delta:
+      event = Event(
+          invocation_id=ic.invocation_id,
+          author='user',
+          actions=EventActions(state_delta=state_delta),
+          content=content,
+      )
+    else:
+      event = Event(
+          invocation_id=ic.invocation_id,
+          author='user',
+          content=content,
+      )
     # when a paused task delegation is in flight, stamp
     # the new user message with that task's isolation_scope so the
     # task agent's content-build (scoped to <fc_id>) sees it.
@@ -989,6 +1004,7 @@ async def run_async(
               user_id=user_id,
               session_id=session_id,
               new_message=new_message,
+              state_delta=state_delta,
               run_config=run_config,
               yield_user_message=yield_user_message,
               node=agent_to_run,
@@ -1008,6 +1024,7 @@ async def run_async(
               user_id=user_id,
               session_id=session_id,
               new_message=new_message,
+              state_delta=state_delta,
               run_config=run_config,
               yield_user_message=yield_user_message,
           )