fix(adapters): ground native schemas, merge-not-replace, add goose/cagent/zed

- common/mcp.go: MCPStyle enum + BuildMCPMapStyled for claude/crush/opencode/zed dialects - common/jsonmerge.go: MergeJSONKeys (JSON-first, JSONC fallback) preserves user keys; fix: try plain json.Unmarshal before StripJSONComments to avoid mangling URLs with // - common/yamlmerge.go: MergeYAMLKeys for YAML configs (goose) - common/blocks.go: add ProvidersAsMap for opencode map-shaped provider key - claudecode: merge settings.json (preserves hooks/permissions/env); MCPClaudeStyle (no type field) - crush: fix mcp key (was mcpServers); MCPCrushStyle entries include type field; merge crush.json; fix import key mcp - kilo: drop providers key (kilo has none); MCPOpencodeStyle (local/remote); merge kilo.json - opencode: fix provider (singular map) + model (not default_model); MCPOpencodeStyle; merge jsonc; fix import key mcp - goose: new adapter — YAML merge, extensions map, splitProviderModel, import reconstructs MCP from extensions - cagent: new adapter — renders starter default.yaml, import returns empty - zed: new adapter — merge settings.json, context_servers (MCPZedStyle) + agent.default_model - docs: append Grounded harness schemas section to design spec
2026-10-19 01:27:34 +00:00 · 2026-05-23 03:23:02 +01:00
parent a18cb1a4b7
commit 63bd976f4b
25 changed files with 1557 additions and 58 deletions
@@ -0,0 +1,145 @@
+package goose
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"gopkg.in/yaml.v3"
+
+	"github.com/lukaszraczylo/harness-sync/internal/adapter"
+	"github.com/lukaszraczylo/harness-sync/internal/canonical"
+)
+
+func bundle() *canonical.Bundle {
+	return &canonical.Bundle{
+		Root: "/canon",
+		Profile: canonical.Profile{
+			Gateway: canonical.Gateway{DefaultModel: "anthropic/claude-sonnet-4-6"},
+		},
+		MCP: canonical.MCPRegistry{Servers: []canonical.MCPServer{
+			{Name: "filepuff", Command: "/bin/filepuff", Args: []string{"--serve"}},
+		}},
+	}
+}
+
+func TestGooseRenderProducesExpectedTargets(t *testing.T) {
+	home := t.TempDir()
+	ad := New(WithHome(home))
+	fs, err := ad.Render(bundle())
+	require.NoError(t, err)
+
+	seen := map[string]adapter.File{}
+	fs.ForEach(func(f adapter.File) { seen[f.Dest] = f })
+
+	cfgDest := filepath.Join(home, ".config", "goose", "config.yaml")
+	require.Contains(t, seen, cfgDest)
+	assert.Equal(t, adapter.RenderedFile, seen[cfgDest].Kind)
+
+	var parsed map[string]any
+	require.NoError(t, yaml.Unmarshal(seen[cfgDest].Content, &parsed))
+	assert.Equal(t, "anthropic", parsed["GOOSE_PROVIDER"])
+	assert.Equal(t, "claude-sonnet-4-6", parsed["GOOSE_MODEL"])
+	assert.Contains(t, parsed, "extensions")
+
+	exts := parsed["extensions"].(map[string]any)
+	fp := exts["filepuff"].(map[string]any)
+	assert.Equal(t, "stdio", fp["type"])
+	assert.Equal(t, "/bin/filepuff", fp["cmd"])
+}
+
+func TestGooseRenderMergesExistingKeys(t *testing.T) {
+	home := t.TempDir()
+	base := filepath.Join(home, ".config", "goose")
+	require.NoError(t, os.MkdirAll(base, 0o750))
+	require.NoError(t, os.WriteFile(filepath.Join(base, "config.yaml"),
+		[]byte("GOOSE_TEMPERATURE: \"0.7\"\nGOOSE_PROVIDER: old\n"), 0o600))
+
+	ad := New(WithHome(home))
+	fs, err := ad.Render(bundle())
+	require.NoError(t, err)
+
+	seen := map[string]adapter.File{}
+	fs.ForEach(func(f adapter.File) { seen[f.Dest] = f })
+
+	var parsed map[string]any
+	require.NoError(t, yaml.Unmarshal(seen[filepath.Join(base, "config.yaml")].Content, &parsed))
+	// Existing unrelated key preserved.
+	assert.Equal(t, "0.7", parsed["GOOSE_TEMPERATURE"])
+	// Provider updated.
+	assert.Equal(t, "anthropic", parsed["GOOSE_PROVIDER"])
+}
+
+func TestGooseRenderGatewayURL(t *testing.T) {
+	home := t.TempDir()
+	ad := New(WithHome(home))
+	b := &canonical.Bundle{
+		Profile: canonical.Profile{
+			Gateway: canonical.Gateway{URL: "https://gw", DefaultModel: "sonnet"},
+		},
+	}
+	fs, err := ad.Render(b)
+	require.NoError(t, err)
+
+	seen := map[string]adapter.File{}
+	fs.ForEach(func(f adapter.File) { seen[f.Dest] = f })
+
+	cfgDest := filepath.Join(home, ".config", "goose", "config.yaml")
+	var parsed map[string]any
+	require.NoError(t, yaml.Unmarshal(seen[cfgDest].Content, &parsed))
+	// Custom gateway → provider is "harness-sync" (user must write custom_providers file).
+	assert.Equal(t, "harness-sync", parsed["GOOSE_PROVIDER"])
+}
+
+func TestGooseImport(t *testing.T) {
+	home := t.TempDir()
+	base := filepath.Join(home, ".config", "goose")
+	require.NoError(t, os.MkdirAll(base, 0o750))
+
+	cfg := map[string]any{
+		"GOOSE_PROVIDER": "anthropic",
+		"GOOSE_MODEL":    "claude-sonnet-4-6",
+		"extensions": map[string]any{
+			"filepuff": map[string]any{
+				"type":    "stdio",
+				"cmd":     "/bin/filepuff",
+				"args":    []string{"--serve"},
+				"enabled": true,
+			},
+		},
+	}
+	body, err := yaml.Marshal(cfg)
+	require.NoError(t, err)
+	require.NoError(t, os.WriteFile(filepath.Join(base, "config.yaml"), body, 0o600))
+
+	ad := New(WithHome(home))
+	res, err := ad.Import(home)
+	require.NoError(t, err)
+	require.NotNil(t, res)
+	require.Len(t, res.MCP, 1)
+	assert.Equal(t, "filepuff", res.MCP[0].Name)
+	assert.Equal(t, "/bin/filepuff", res.MCP[0].Command)
+}
+
+func TestGooseImportMissing(t *testing.T) {
+	ad := New(WithHome(t.TempDir()))
+	res, err := ad.Import(t.TempDir())
+	require.NoError(t, err)
+	assert.NotNil(t, res)
+	assert.Empty(t, res.MCP)
+}
+
+func TestSplitProviderModel(t *testing.T) {
+	t.Run("with slash", func(t *testing.T) {
+		p, m := splitProviderModel("anthropic/claude-sonnet-4-6")
+		assert.Equal(t, "anthropic", p)
+		assert.Equal(t, "claude-sonnet-4-6", m)
+	})
+	t.Run("no slash", func(t *testing.T) {
+		p, m := splitProviderModel("claude-sonnet")
+		assert.Equal(t, "anthropic", p)
+		assert.Equal(t, "claude-sonnet", m)
+	})
+}