Merge pull request #1074 from rumpl/feat-skills

Skills

Author: dgageot

pkg/agent/agent.go

@@ -29,6 +29,7 @@ type Agent struct {
 	tools              []tools.Tool
 	commands           map[string]string
 	pendingWarnings    []string
+	skillsEnabled      bool
 }
 
 // New creates a new agent
@@ -114,6 +115,11 @@ func (a *Agent) Commands() map[string]string {
 	return a.commands
 }
 
+// SkillsEnabled returns whether skills discovery is enabled for this agent.
+func (a *Agent) SkillsEnabled() bool {
+	return a.skillsEnabled
+}
+
 // Tools returns the tools available to this agent
 func (a *Agent) Tools(ctx context.Context) ([]tools.Tool, error) {
 	a.ensureToolSetsAreStarted(ctx)

pkg/agent/opts.go

@@ -117,6 +117,12 @@ func WithLoadTimeWarnings(warnings []string) Opt {
 	}
 }
 
+func WithSkillsEnabled(enabled bool) Opt {
+	return func(a *Agent) {
+		a.skillsEnabled = enabled
+	}
+}
+
 type StartableToolSet struct {
 	tools.ToolSet
 	started atomic.Bool

pkg/config/config.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
+	"slices"
 
 	"github.com/goccy/go-yaml"
 
@@ -116,6 +117,10 @@ func validateConfig(cfg *latest.Config) error {
 				return fmt.Errorf("agent '%s' references non-existent sub-agent '%s'", agentName, subAgentName)
 			}
 		}
+
+		if err := validateSkillsConfiguration(agentName, &agent); err != nil {
+			return err
+		}
 	}
 
 	return nil
@@ -124,3 +129,44 @@ func validateConfig(cfg *latest.Config) error {
 func boolPtr(b bool) *bool {
 	return &b
 }
+
+// validateSkillsConfiguration ensures that agents with skills enabled have the necessary tools
+func validateSkillsConfiguration(agentName string, agent *latest.AgentConfig) error {
+	// Check if skills are enabled
+	if agent.Skills == nil || !*agent.Skills {
+		return nil
+	}
+
+	// Skills are enabled, validate toolsets
+	hasFilesystemToolset := false
+	hasReadFileTool := false
+
+	for _, toolset := range agent.Toolsets {
+		if toolset.Type == "filesystem" {
+			hasFilesystemToolset = true
+
+			// Check if read_file tool is enabled
+			// If no specific tools are listed, all tools are enabled
+			if len(toolset.Tools) == 0 {
+				hasReadFileTool = true
+				break
+			}
+
+			// Check if read_file is in the tools list
+			if slices.Contains(toolset.Tools, "read_file") {
+				hasReadFileTool = true
+				break
+			}
+		}
+	}
+
+	if !hasFilesystemToolset {
+		return fmt.Errorf("agent '%s' has skills enabled but does not have a 'filesystem' toolset configured", agentName)
+	}
+
+	if !hasReadFileTool {
+		return fmt.Errorf("agent '%s' has skills enabled but the 'filesystem' toolset does not include the 'read_file' tool", agentName)
+	}
+
+	return nil
+}

pkg/config/latest/types.go

@@ -38,6 +38,7 @@ type AgentConfig struct {
 	AddPromptFiles     []string          `json:"add_prompt_files,omitempty" yaml:"add_prompt_files,omitempty"`
 	Commands           types.Commands    `json:"commands,omitempty"`
 	StructuredOutput   *StructuredOutput `json:"structured_output,omitempty"`
+	Skills             *bool             `json:"skills,omitempty"`
 }
 
 // ModelConfig represents the configuration for a model

pkg/config/testdata/skills_disabled.yaml

@@ -0,0 +1,8 @@
+version: "3"
+
+agents:
+  root:
+    model: openai/gpt-4o
+    skills: false
+    toolsets:
+      - type: shell

pkg/config/testdata/skills_missing_filesystem.yaml

@@ -0,0 +1,8 @@
+version: "3"
+
+agents:
+  root:
+    model: openai/gpt-4o
+    skills: true
+    toolsets:
+      - type: shell

pkg/config/testdata/skills_missing_read_file.yaml

@@ -0,0 +1,9 @@
+version: "3"
+
+agents:
+  root:
+    model: openai/gpt-4o
+    skills: true
+    toolsets:
+      - type: filesystem
+        tools: ["write_file", "edit_file"]

pkg/config/testdata/skills_valid_all_tools.yaml

@@ -0,0 +1,8 @@
+version: "3"
+
+agents:
+  root:
+    model: openai/gpt-4o
+    skills: true
+    toolsets:
+      - type: filesystem

pkg/config/testdata/skills_valid_explicit_tools.yaml

@@ -0,0 +1,9 @@
+version: "3"
+
+agents:
+  root:
+    model: openai/gpt-4o
+    skills: true
+    toolsets:
+      - type: filesystem
+        tools: ["read_file", "write_file"]

pkg/config/validation_test.go

@@ -47,6 +47,14 @@ func TestValidationErrors(t *testing.T) {
 			name: "post_edit in non filesystem toolset",
 			path: "invalid_post_edit_v2.yaml",
 		},
+		{
+			name: "skills enabled without filesystem toolset",
+			path: "skills_missing_filesystem.yaml",
+		},
+		{
+			name: "skills enabled without read_file tool",
+			path: "skills_missing_read_file.yaml",
+		},
 	}
 
 	for _, tt := range tests {
@@ -58,3 +66,35 @@ func TestValidationErrors(t *testing.T) {
 		})
 	}
 }
+
+func TestValidSkillsConfiguration(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		name string
+		path string
+	}{
+		{
+			name: "skills with all filesystem tools",
+			path: "skills_valid_all_tools.yaml",
+		},
+		{
+			name: "skills with explicit read_file tool",
+			path: "skills_valid_explicit_tools.yaml",
+		},
+		{
+			name: "skills disabled",
+			path: "skills_disabled.yaml",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+
+			cfg, err := Load(t.Context(), testfileSource(filepath.Join("testdata", tt.path)))
+			require.NoError(t, err)
+			require.NotNil(t, cfg)
+		})
+	}
+}