fix(tools): hide skill script tool when no scripts exist

src/google/adk/tools/skill_toolset.py

@@ -105,6 +105,14 @@ def _build_skill_system_instruction(prefix: str | None = None) -> str:
   )
 
 
+def _skill_has_scripts(skill: models.Skill) -> bool:
+  """Returns whether a skill exposes at least one executable script."""
+  resources = getattr(skill, "resources", None)
+  if resources is None:
+    return False
+  return bool(resources.list_scripts())
+
+
 class ListSkillsTool(BaseTool):
   """Tool to list all available skills."""
 
@@ -1037,8 +1045,11 @@ def __init__(
         ListSkillsTool(self),
         LoadSkillTool(self),
         LoadSkillResourceTool(self),
-        RunSkillScriptTool(self),
     ]
+    if self._registry or any(
+        _skill_has_scripts(skill) for skill in self._skills.values()
+    ):
+      self._tools.append(RunSkillScriptTool(self))
     if self._registry:
       self._tools.append(SearchSkillsTool(self))
 

tests/unittests/tools/bigquery/test_bigquery_skill.py

@@ -24,7 +24,6 @@
 from google.adk.tools.skill_toolset import ListSkillsTool
 from google.adk.tools.skill_toolset import LoadSkillResourceTool
 from google.adk.tools.skill_toolset import LoadSkillTool
-from google.adk.tools.skill_toolset import RunSkillScriptTool
 from google.adk.tools.skill_toolset import SkillToolset
 import pytest
 
@@ -80,19 +79,18 @@ def test_skill_has_expected_references():
 
 @pytest.mark.asyncio
 async def test_skill_works_with_skill_toolset():
-  """Verify the skill integrates with SkillToolset and produces 4 tools."""
+  """Verify the skill integrates with SkillToolset and produces 3 tools."""
   skill = get_bigquery_skill()
   toolset = SkillToolset(skills=[skill])
 
   tools = await toolset.get_tools()
-  assert len(tools) == 4
+  assert len(tools) == 3
 
   tool_types = {type(t) for t in tools}
   expected_types = {
       ListSkillsTool,
       LoadSkillTool,
       LoadSkillResourceTool,
-      RunSkillScriptTool,
   }
   assert tool_types == expected_types
 

tests/unittests/tools/test_skill_toolset.py

@@ -225,6 +225,38 @@ async def test_get_tools(mock_skill1, mock_skill2):
   assert isinstance(tools[3], skill_toolset.RunSkillScriptTool)
 
 
+@pytest.mark.asyncio
+async def test_get_tools_excludes_run_skill_script_when_no_skill_has_scripts(
+    mock_skill2,
+):
+  toolset = skill_toolset.SkillToolset([mock_skill2])
+
+  tools = await toolset.get_tools()
+
+  assert [tool.name for tool in tools] == [
+      "list_skills",
+      "load_skill",
+      "load_skill_resource",
+  ]
+  assert not any(
+      isinstance(tool, skill_toolset.RunSkillScriptTool) for tool in tools
+  )
+
+
+@pytest.mark.asyncio
+async def test_get_tools_includes_run_skill_script_when_any_skill_has_scripts(
+    mock_skill1,
+    mock_skill2,
+):
+  toolset = skill_toolset.SkillToolset([mock_skill2, mock_skill1])
+
+  tools = await toolset.get_tools()
+
+  assert any(
+      isinstance(tool, skill_toolset.RunSkillScriptTool) for tool in tools
+  )
+
+
 @pytest.mark.asyncio
 async def test_resolve_additional_tools_from_state_none(mock_skill1):
   toolset = skill_toolset.SkillToolset([mock_skill1])