mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-20 12:23:22 +00:00
* feat(targets): support OpenCode config directory accounts OpenCode v2 introduces support for custom configuration directories via OPENCODE_CONFIG_DIR, storing opencode.json and agent directories. Previously, skillshare rejected OpenCode accounts configured with a custom config directory because OpenCode was missing config_dir and was excluded from accountAgents in hooks and MCP services. - Define default config_dir (~/.config/opencode) in targets.yaml - Add OpenCode to account agents and register OPENCODE_CONFIG_DIR across hooks and MCP service handlers - Route OpenCode account MCP configuration to opencode.json inside the account config directory Resolves #593. * fix(targets): add OpenCode to schemas, completions and docs Add opencode to the targetConfig.agent enum and config_dir description in schemas/config.schema.json so configurations containing OpenCode account targets pass schema validation. Include opencode in the target --agent completion scripts for Bash, Zsh, Fish, PowerShell, and Nushell. Update website documentation and built-in skill references to describe OpenCode accounts and OPENCODE_CONFIG_DIR management alongside other account agents. * fix(targets): support plugin accounts and overlap Add OpenCode account recognition and OPENCODE_CONFIG_DIR resolution to the plugin service so plugin sync works for OpenCode account targets. Introduce TargetScanPaths to resolve cross-runtime scan paths using TargetConfig.Agent for account targets while retaining the account's own primary directory. Update path overlap detection, doctor checks, and LeakedSkills to warn about leaked skills for account targets. Update localized docs (zh-Hans, zh-Hant, ja, ko) and plugin references to document OpenCode account targets and OPENCODE_CONFIG_DIR. Update the available targets handler test to expect OpenCode's configDir. * fix(targets): isolate OpenCode accounts and scan paths Reject OPENCODE_CONFIG overrides when operating on OpenCode accounts and clear OPENCODE_CONFIG in the account execution environment so plugin operations target the account directory. In TargetScanPaths, remap config-root paths to the account directory while preserving external scan paths like Codex's ~/.agents/skills. * fix(plugins): use account target in OpenCode update probe Pass c.Target instead of a hardcoded "opencode" when probing whether OpenCode supports plugin updates, ensuring account-configured CLI binaries and account environment variables are used during preview. * test(mcp): isolate XDG_CONFIG_HOME in account test service Isolate XDG_CONFIG_HOME to the temporary test directory in agentAccountService to prevent runner environment variables from leaking into TestAccountEnvOverrideDoesNotPruneDefaultHome when testing OpenCode account shell overrides. --------- Co-authored-by: Willie <egg358358@gmail.com>
233 lines
9.9 KiB
Go
233 lines
9.9 KiB
Go
package config
|
|
|
|
import (
|
|
"path/filepath"
|
|
"slices"
|
|
"testing"
|
|
)
|
|
|
|
func TestDetectPathOverlap_CrossRuntimeDiscovery(t *testing.T) {
|
|
// codex's runtime reads ~/.agents/skills, which universal writes to.
|
|
involved := DetectPathOverlap(map[string]TargetConfig{
|
|
"codex": {Skills: &ResourceTargetConfig{Path: "~/.codex/skills"}},
|
|
"universal": {Skills: &ResourceTargetConfig{Path: "~/.agents/skills"}},
|
|
}, false, nil)
|
|
|
|
for _, want := range []string{"codex", "universal"} {
|
|
if !slices.Contains(involved, want) {
|
|
t.Errorf("DetectPathOverlap = %v, missing %s", involved, want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestDetectPathOverlap_AccountTargetCrossRuntimeDiscovery(t *testing.T) {
|
|
// opencode-work is an account of opencode; its runtime reads ~/.claude/skills, which claude writes to.
|
|
involved := DetectPathOverlap(map[string]TargetConfig{
|
|
"opencode-work": {Agent: "opencode", ConfigDir: "~/.config/opencode-work", Skills: &ResourceTargetConfig{Path: "~/.config/opencode-work/skills"}},
|
|
"claude": {Skills: &ResourceTargetConfig{Path: "~/.claude/skills"}},
|
|
}, false, nil)
|
|
|
|
for _, want := range []string{"opencode-work", "claude"} {
|
|
if !slices.Contains(involved, want) {
|
|
t.Errorf("DetectPathOverlap = %v, missing %s", involved, want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestDetectPathOverlap_CodexAccountCrossRuntimeDiscovery(t *testing.T) {
|
|
// codex-work is an account of codex; its runtime still reads universal's ~/.agents/skills.
|
|
involved := DetectPathOverlap(map[string]TargetConfig{
|
|
"codex-work": {Agent: "codex", ConfigDir: "~/.codex-work", Skills: &ResourceTargetConfig{Path: "~/.codex-work/skills"}},
|
|
"universal": {Skills: &ResourceTargetConfig{Path: "~/.agents/skills"}},
|
|
}, false, nil)
|
|
|
|
for _, want := range []string{"codex-work", "universal"} {
|
|
if !slices.Contains(involved, want) {
|
|
t.Errorf("DetectPathOverlap = %v, missing %s", involved, want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestDetectPathOverlap_CodexAccountDoesNotReadDefaultCodexSkills(t *testing.T) {
|
|
// A custom target writing to ~/.codex/skills should not conflict with codex-work,
|
|
// because codex-work reads ~/.codex-work/skills and ~/.agents/skills, not ~/.codex/skills.
|
|
involved := DetectPathOverlap(map[string]TargetConfig{
|
|
"codex-work": {Agent: "codex", ConfigDir: "~/.codex-work", Skills: &ResourceTargetConfig{Path: "~/.codex-work/skills"}},
|
|
"other-writer": {Skills: &ResourceTargetConfig{Path: "~/.codex/skills"}},
|
|
}, false, nil)
|
|
|
|
if slices.Contains(involved, "codex-work") {
|
|
t.Errorf("DetectPathOverlap = %v, unexpectedly contains codex-work for ~/.codex/skills", involved)
|
|
}
|
|
}
|
|
|
|
func TestDetectPathOverlap_CodexSharesUniversalPath(t *testing.T) {
|
|
// Default codex path is universal's ~/.agents/skills — a shared-primary overlap.
|
|
involved := DetectPathOverlap(map[string]TargetConfig{
|
|
"codex": {Skills: &ResourceTargetConfig{Path: "~/.agents/skills"}},
|
|
"universal": {Skills: &ResourceTargetConfig{Path: "~/.agents/skills"}},
|
|
}, false, nil)
|
|
|
|
for _, want := range []string{"codex", "universal"} {
|
|
if !slices.Contains(involved, want) {
|
|
t.Errorf("DetectPathOverlap = %v, missing %s", involved, want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestDetectPathOverlap_LegacyGoosePathStillWarns(t *testing.T) {
|
|
// A config written before the default moved keeps goose on its own path;
|
|
// goose still reads universal's ~/.agents/skills, so the warning must stay.
|
|
involved := DetectPathOverlap(map[string]TargetConfig{
|
|
"goose": {Skills: &ResourceTargetConfig{Path: "~/.config/goose/skills"}},
|
|
"universal": {Skills: &ResourceTargetConfig{Path: "~/.agents/skills"}},
|
|
}, false, nil)
|
|
|
|
for _, want := range []string{"goose", "universal"} {
|
|
if !slices.Contains(involved, want) {
|
|
t.Errorf("DetectPathOverlap = %v, missing %s", involved, want)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestDetectPathOverlap_IgnoresScannerOwnPath(t *testing.T) {
|
|
// claude's runtime scans its own ~/.claude/skills; that is not an overlap
|
|
// with the unrelated target writing elsewhere.
|
|
involved := DetectPathOverlap(map[string]TargetConfig{
|
|
"claude": {Skills: &ResourceTargetConfig{Path: "~/.claude/skills"}},
|
|
"junie": {Skills: &ResourceTargetConfig{Path: "~/.junie/skills"}},
|
|
}, false, nil)
|
|
|
|
if len(involved) != 0 {
|
|
t.Errorf("expected no overlap, got %v", involved)
|
|
}
|
|
}
|
|
|
|
func TestSkillsFolderConflicts_DifferentFilters(t *testing.T) {
|
|
got := SkillsFolderConflicts(map[string]TargetConfig{
|
|
"universal": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills", Exclude: []string{"feature-radar*"}}},
|
|
"codex": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills/"}},
|
|
"claude": {Skills: &ResourceTargetConfig{Path: "/tmp/claude/skills"}},
|
|
}, "")
|
|
want := []SkillsFolderConflict{{Path: "/tmp/agents/skills", Targets: []string{"codex", "universal"}, Keep: "universal", Stop: []string{"codex"}}}
|
|
if !slices.EqualFunc(got, want, conflictEqual) {
|
|
t.Errorf("SkillsFolderConflicts = %+v, want %+v", got, want)
|
|
}
|
|
}
|
|
|
|
func TestSkillsFolderConflicts_SameSettingsNoConflict(t *testing.T) {
|
|
got := SkillsFolderConflicts(map[string]TargetConfig{
|
|
"universal": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills", Include: []string{"a", "b"}}},
|
|
"codex": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills", Include: []string{"b", "a"}}},
|
|
}, "")
|
|
if len(got) != 0 {
|
|
t.Errorf("expected no conflict, got %+v", got)
|
|
}
|
|
}
|
|
|
|
func TestSkillsFolderConflicts_DifferentFiltersKeepsFirstName(t *testing.T) {
|
|
got := SkillsFolderConflicts(map[string]TargetConfig{
|
|
"warp": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills", Include: []string{"x*"}}},
|
|
"amp": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills"}},
|
|
"witsy": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills"}},
|
|
}, "")
|
|
want := []SkillsFolderConflict{{Path: "/tmp/agents/skills", Targets: []string{"amp", "warp", "witsy"}, Keep: "amp", Stop: []string{"warp", "witsy"}}}
|
|
if !slices.EqualFunc(got, want, conflictEqual) {
|
|
t.Errorf("SkillsFolderConflicts = %+v, want %+v", got, want)
|
|
}
|
|
}
|
|
|
|
func TestSkillsFolderConflicts_DifferentTargetNaming(t *testing.T) {
|
|
got := SkillsFolderConflicts(map[string]TargetConfig{
|
|
"aflat": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills", Mode: "merge", TargetNaming: "flat"}},
|
|
"bstd": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills", Mode: "merge", TargetNaming: "standard"}},
|
|
}, "")
|
|
want := []SkillsFolderConflict{{Path: "/tmp/agents/skills", Targets: []string{"aflat", "bstd"}, Keep: "aflat", Stop: []string{"bstd"}}}
|
|
if !slices.EqualFunc(got, want, conflictEqual) {
|
|
t.Errorf("SkillsFolderConflicts = %+v, want %+v", got, want)
|
|
}
|
|
}
|
|
|
|
func TestSkillsFolderConflicts_DifferentMode(t *testing.T) {
|
|
got := SkillsFolderConflicts(map[string]TargetConfig{
|
|
"amerge": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills", Mode: "merge"}},
|
|
"bcopy": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills", Mode: "copy"}},
|
|
}, "")
|
|
want := []SkillsFolderConflict{{Path: "/tmp/agents/skills", Targets: []string{"amerge", "bcopy"}, Keep: "amerge", Stop: []string{"bcopy"}}}
|
|
if !slices.EqualFunc(got, want, conflictEqual) {
|
|
t.Errorf("SkillsFolderConflicts = %+v, want %+v", got, want)
|
|
}
|
|
}
|
|
|
|
func TestSkillsFolderConflicts_SymlinkIgnoresTargetNaming(t *testing.T) {
|
|
got := SkillsFolderConflicts(map[string]TargetConfig{
|
|
"aflat": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills", Mode: "symlink", TargetNaming: "flat"}},
|
|
"bstd": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills", TargetNaming: "standard"}},
|
|
}, "symlink")
|
|
if len(got) != 0 {
|
|
t.Errorf("expected no conflict, got %+v", got)
|
|
}
|
|
}
|
|
|
|
func TestSkillsFolderConflicts_SymlinkIgnoresFilters(t *testing.T) {
|
|
got := SkillsFolderConflicts(map[string]TargetConfig{
|
|
"universal": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills", Mode: "symlink", Exclude: []string{"x"}}},
|
|
"codex": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills", Mode: "symlink"}},
|
|
}, "")
|
|
if len(got) != 0 {
|
|
t.Errorf("expected no conflict, got %+v", got)
|
|
}
|
|
}
|
|
|
|
func TestSkillsFolderConflicts_UnsetEqualsDefault(t *testing.T) {
|
|
got := SkillsFolderConflicts(map[string]TargetConfig{
|
|
"unset": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills"}},
|
|
"explicit": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills", Mode: "merge", TargetNaming: "flat"}},
|
|
}, "")
|
|
if len(got) != 0 {
|
|
t.Errorf("expected no conflict, got %+v", got)
|
|
}
|
|
}
|
|
|
|
func TestSkillsFolderConflicts_UnsetModeInheritsDefault(t *testing.T) {
|
|
got := SkillsFolderConflicts(map[string]TargetConfig{
|
|
"unset": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills"}},
|
|
"explicit": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills", Mode: "copy"}},
|
|
}, "copy")
|
|
if len(got) != 0 {
|
|
t.Errorf("expected no conflict, got %+v", got)
|
|
}
|
|
}
|
|
|
|
func TestSkillsFolderConflicts_IgnoresSkillsOff(t *testing.T) {
|
|
got := SkillsFolderConflicts(map[string]TargetConfig{
|
|
"universal": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills", Exclude: []string{"x"}}},
|
|
"codex": disabledAt("/tmp/agents/skills"),
|
|
}, "")
|
|
if len(got) != 0 {
|
|
t.Errorf("expected no conflict with skills off, got %+v", got)
|
|
}
|
|
}
|
|
|
|
func conflictEqual(a, b SkillsFolderConflict) bool {
|
|
return filepath.ToSlash(a.Path) == filepath.ToSlash(b.Path) && a.Keep == b.Keep && slices.Equal(a.Targets, b.Targets) && slices.Equal(a.Stop, b.Stop)
|
|
}
|
|
|
|
func TestSkillsSharedWith(t *testing.T) {
|
|
targets := map[string]TargetConfig{
|
|
"universal": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills"}},
|
|
"codex": {Skills: &ResourceTargetConfig{Path: "/tmp/agents/skills/"}},
|
|
"off": disabledAt("/tmp/agents/skills"),
|
|
"claude": {Skills: &ResourceTargetConfig{Path: "/tmp/claude/skills"}},
|
|
}
|
|
if got := SkillsSharedWith(targets, "universal"); !slices.Equal(got, []string{"codex"}) {
|
|
t.Errorf("SkillsSharedWith(universal) = %v, want [codex]", got)
|
|
}
|
|
if got := SkillsSharedWith(targets, "off"); got != nil {
|
|
t.Errorf("SkillsSharedWith(off) = %v, want nil for a target with skills off", got)
|
|
}
|
|
if got := SkillsSharedWith(targets, "claude"); got != nil {
|
|
t.Errorf("SkillsSharedWith(claude) = %v, want nil", got)
|
|
}
|
|
}
|