Skip to content

feat(agent/agentcontextconfig): discover skills from ~/.coder/skills #25271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mafredri merged 1 commit into from
May 13, 2026
Merged

feat(agent/agentcontextconfig): discover skills from ~/.coder/skills #25271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion agent/agentcontextconfig/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,14 @@ var skillNamePattern = regexp.MustCompile(

// Default values for agent-internal configuration. These are
// used when the corresponding env vars are unset.
//
// DefaultSkillsDir is a comma-separated list so home-scoped
// skills override project-scoped ones with the same name
// (discoverSkills picks the first occurrence per skill name).
const (
DefaultInstructionsDir = "~/.coder"
DefaultInstructionsFile = "AGENTS.md"
DefaultSkillsDir = ".agents/skills"
DefaultSkillsDir = "~/.coder/skills,.agents/skills"
DefaultSkillMetaFile = "SKILL.md"
DefaultMCPConfigFile = ".mcp.json"
)
Expand Down
31 changes: 31 additions & 0 deletions agent/agentcontextconfig/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,37 @@ func TestResolve(t *testing.T) {
require.Len(t, skillParts, 1)
require.Equal(t, "from skills1", skillParts[0].SkillDescription)
})

//nolint:paralleltest // Uses t.Setenv to mutate HOME.
t.Run("DefaultDiscoversHomeAndProjectSkillsHomeWins", func(t *testing.T) {
fakeHome := t.TempDir()
t.Setenv("HOME", fakeHome)
t.Setenv("USERPROFILE", fakeHome)
workDir := t.TempDir()

homeSkills := filepath.Join(fakeHome, ".coder", "skills")
writeSkillMetaFileInRoot(t, homeSkills, "home-only", "home only")
writeSkillMetaFileInRoot(t, homeSkills, "shared", "from home")
writeSkillMetaFile(t, workDir, "project-only", "project only")
writeSkillMetaFile(t, workDir, "shared", "from project")

// Construct the Config directly with the package defaults
// to verify the default skills list (and only the defaults).
cfg, _ := agentcontextconfig.Resolve(workDir, agentcontextconfig.Config{
SkillsDirs: agentcontextconfig.DefaultSkillsDir,
SkillMetaFile: agentcontextconfig.DefaultSkillMetaFile,
})

got := map[string]string{}
for _, p := range filterParts(cfg.Parts, codersdk.ChatMessagePartTypeSkill) {
got[p.SkillName] = p.SkillDescription
}
require.Equal(t, map[string]string{
"home-only": "home only",
"project-only": "project only",
"shared": "from home",
}, got)
})
}

func TestNewAPI_LazyDirectory(t *testing.T) {
Expand Down
Loading