From ec660ed4f0214fd2a88569d13d819a8035adb748 Mon Sep 17 00:00:00 2001
From: Kathy Wu <wukathy@google.com>
Date: Mon, 9 Feb 2026 16:07:03 -0800
Subject: [PATCH] chore: Add experimental tag to SkillToolset

Co-authored-by: Kathy Wu <wukathy@google.com>
PiperOrigin-RevId: 867816959
---
 src/google/adk/features/_feature_registry.py | 4 ++++
 src/google/adk/tools/skill_toolset.py        | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/google/adk/features/_feature_registry.py b/src/google/adk/features/_feature_registry.py
index 154c77ca..81089162 100644
--- a/src/google/adk/features/_feature_registry.py
+++ b/src/google/adk/features/_feature_registry.py
@@ -41,6 +41,7 @@ class FeatureName(str, Enum):
   PROGRESSIVE_SSE_STREAMING = "PROGRESSIVE_SSE_STREAMING"
   PUBSUB_TOOL_CONFIG = "PUBSUB_TOOL_CONFIG"
   PUBSUB_TOOLSET = "PUBSUB_TOOLSET"
+  SKILL_TOOLSET = "SKILL_TOOLSET"
   SPANNER_TOOLSET = "SPANNER_TOOLSET"
   SPANNER_TOOL_SETTINGS = "SPANNER_TOOL_SETTINGS"
   SPANNER_VECTOR_STORE = "SPANNER_VECTOR_STORE"
@@ -123,6 +124,9 @@ _FEATURE_REGISTRY: dict[FeatureName, FeatureConfig] = {
     FeatureName.PUBSUB_TOOLSET: FeatureConfig(
         FeatureStage.EXPERIMENTAL, default_on=True
     ),
+    FeatureName.SKILL_TOOLSET: FeatureConfig(
+        FeatureStage.EXPERIMENTAL, default_on=True
+    ),
     FeatureName.SPANNER_TOOLSET: FeatureConfig(
         FeatureStage.EXPERIMENTAL, default_on=True
     ),
diff --git a/src/google/adk/tools/skill_toolset.py b/src/google/adk/tools/skill_toolset.py
index e71f4f39..46566658 100644
--- a/src/google/adk/tools/skill_toolset.py
+++ b/src/google/adk/tools/skill_toolset.py
@@ -21,6 +21,8 @@ from typing import Any
 from google.genai import types
 
 from ..agents.readonly_context import ReadonlyContext
+from ..features import experimental
+from ..features import FeatureName
 from ..models.llm_request import LlmRequest
 from ..skills import models
 from ..skills import prompt
@@ -29,6 +31,7 @@ from .base_toolset import BaseToolset
 from .tool_context import ToolContext
 
 
+@experimental(FeatureName.SKILL_TOOLSET)
 class LoadSkillTool(BaseTool):
   """Tool to load a skill's instructions."""
 
@@ -79,6 +82,7 @@ class LoadSkillTool(BaseTool):
     }
 
 
+@experimental(FeatureName.SKILL_TOOLSET)
 class LoadSkillResourceTool(BaseTool):
   """Tool to load resources (references or assets) from a skill."""
 
@@ -167,6 +171,7 @@ class LoadSkillResourceTool(BaseTool):
     }
 
 
+@experimental(FeatureName.SKILL_TOOLSET)
 class SkillToolset(BaseToolset):
   """A toolset for managing and interacting with agent skills."""