Skip to content

armgit / ax

Public Imported from GitHub
0

Agent Executor (AX) is Google's open agentic orchestration runtime

Go

Make Skills Strictly Opt-In in Gemini Planner (#369)

anj-sd57b3d5fe880
diff --git a/internal/gemini/gemini.go b/internal/gemini/gemini.go
index d117fa7..0957667 100644
--- a/internal/gemini/gemini.go
+++ b/internal/gemini/gemini.go
@@ -317,7 +317,8 @@ func NewSkillsTool(dir string) (Tool, error) {
resolvedDir = os.Getenv("SKILLS_DIR")
}
if resolvedDir == "" {
- resolvedDir = skills.DefaultDir()
+ // No skills directory explicitly configured; disable skills completely.
+ return &NoopTool{}, nil
}
if _, err := os.Stat(resolvedDir); os.IsNotExist(err) {
return &NoopTool{}, nil
diff --git a/internal/gemini/gemini_planner_test.go b/internal/gemini/gemini_planner_test.go
index 4154ce2..d68450e 100644
--- a/internal/gemini/gemini_planner_test.go
+++ b/internal/gemini/gemini_planner_test.go
@@ -436,3 +436,34 @@ func TestHandleSubagentCall_Panic(t *testing.T) {
t.Errorf("expected stack trace in error, got %s", errVal)
}
}
+
+// TestNewGeminiPlannerAgent_NoSkillsPrompt verifies that the Gemini planner agent
+// system prompt does not contain the available_skills block when skills are disabled.
+func TestNewGeminiPlannerAgent_NoSkillsPrompt(t *testing.T) {
+ t.Setenv("GEMINI_API_KEY", "mock-key")
+ t.Setenv("SKILLS_DIR", "")
+
+ registry := &mockAgentRegistry{}
+ cfg := GeminiPlannerConfig{
+ GeminiConfig: &config.GeminiConfig{
+ SystemPrompt: "You are AX.",
+ },
+ SkillsDir: "",
+ }
+
+ agent, err := NewGeminiPlannerAgent(context.Background(), registry, cfg)
+ if err != nil {
+ t.Fatalf("NewGeminiPlannerAgent failed: %v", err)
+ }
+
+ p, ok := agent.(*geminiPlannerAgent)
+ if !ok {
+ t.Fatalf("expected agent to be *geminiPlannerAgent, got %T", agent)
+ }
+
+ prompt := p.config.GeminiConfig.SystemPrompt
+ if strings.Contains(prompt, "<available_skills>") {
+ t.Errorf("expected system prompt to not contain '<available_skills>', got: %s", prompt)
+ }
+}
+
diff --git a/internal/gemini/gemini_test.go b/internal/gemini/gemini_test.go
index 7906fdd..a0abcbf 100644
--- a/internal/gemini/gemini_test.go
+++ b/internal/gemini/gemini_test.go
@@ -97,3 +97,20 @@ Instructions go here.`
t.Error("Expected non-empty FuncDecl for SkillsTool")
}
}
+
+// TestNewSkillsTool_NoDir verifies that NewSkillsTool returns a NoopTool
+// when both the specified directory and the SKILLS_DIR environment variable are empty.
+func TestNewSkillsTool_NoDir(t *testing.T) {
+ t.Setenv("SKILLS_DIR", "")
+
+ tool, err := NewSkillsTool("")
+ if err != nil {
+ t.Fatalf("NewSkillsTool failed for empty dir: %v", err)
+ }
+
+ // Verify it returned a NoopTool
+ if _, ok := tool.(*NoopTool); !ok {
+ t.Errorf("Expected NoopTool, got %T", tool)
+ }
+}
+