refactor(adapters): extract common helpers + fix kilo native schema

internal/adapters/opencode/import.go

@@ -1,75 +1,32 @@
 package opencode
 
 import (
-	"encoding/json"
-	"os"
 	"path/filepath"
-	"regexp"
-	"strings"
 
 	"github.com/lukaszraczylo/harness-sync/internal/adapter"
-	"github.com/lukaszraczylo/harness-sync/internal/canonical"
+	"github.com/lukaszraczylo/harness-sync/internal/adapter/common"
 )
 
 func importFrom(home string) (*adapter.ImportResult, error) {
 	base := filepath.Join(home, ".config", "opencode")
 	res := &adapter.ImportResult{}
 
-	cfgBody, err := readIfExists(filepath.Join(base, "opencode.jsonc"))
+	cfgBody, err := common.ReadIfExists(filepath.Join(base, "opencode.jsonc"))
 	if err != nil {
 		return nil, err
 	}
 	if cfgBody != "" {
-		clean := stripJSONComments(cfgBody)
-		var doc struct {
-			MCPServers map[string]struct { //nolint:govet // fieldalignment: map+slice+3 strings irreducible
-				Env       map[string]string `json:"env"`
-				Args      []string          `json:"args"`
-				Command   string            `json:"command"`
-				URL       string            `json:"url"`
-				Transport string            `json:"transport"`
-			} `json:"mcpServers"`
-		}
-		_ = json.Unmarshal([]byte(clean), &doc)
-		for nm, v := range doc.MCPServers {
-			res.MCP = append(res.MCP, canonical.MCPServer{
-				Name:      nm,
-				Command:   v.Command,
-				Args:      v.Args,
-				URL:       v.URL,
-				Transport: v.Transport,
-				Env:       v.Env,
-			})
+		mcpServers, mcpErr := common.ParseMCPFromJSON([]byte(cfgBody), "mcpServers")
+		if mcpErr != nil {
+			return nil, mcpErr
 		}
+		res.MCP = mcpServers
 	}
 
-	body, err := readIfExists(filepath.Join(base, "AGENTS.md"))
+	instructions, err := common.ReadIfExists(filepath.Join(base, "AGENTS.md"))
 	if err != nil {
 		return nil, err
 	}
-	res.Instructions = body
-
+	res.Instructions = instructions
 	return res, nil
 }
-
-var (
-	blockComment = regexp.MustCompile(`(?s)/\*.*?\*/`)
-	lineComment  = regexp.MustCompile(`(?m)//[^\n]*`)
-)
-
-func stripJSONComments(s string) string {
-	s = blockComment.ReplaceAllString(s, "")
-	s = lineComment.ReplaceAllString(s, "")
-	return strings.TrimSpace(s)
-}
-
-func readIfExists(path string) (string, error) {
-	b, err := os.ReadFile(path)
-	if os.IsNotExist(err) {
-		return "", nil
-	}
-	if err != nil {
-		return "", err
-	}
-	return string(b), nil
-}

internal/adapters/opencode/opencode.go

@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 
 	"github.com/lukaszraczylo/harness-sync/internal/adapter"
+	"github.com/lukaszraczylo/harness-sync/internal/adapter/common"
 	"github.com/lukaszraczylo/harness-sync/internal/canonical"
 	"github.com/lukaszraczylo/harness-sync/internal/render"
 )
@@ -76,64 +77,11 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
 }
 
 func renderConfig(b *canonical.Bundle) ([]byte, error) {
-	providers := make([]map[string]any, 0)
-	if b.Profile.Gateway.URL != "" {
-		gw := map[string]any{
-			"id":       "harness-sync-gateway",
-			"name":     "harness-sync gateway",
-			"base_url": b.Profile.Gateway.URL,
-			"api_key":  b.Profile.Gateway.Token,
-		}
-		models := make([]map[string]any, 0, len(b.Profile.Models))
-		for _, m := range b.Profile.Models {
-			entry := map[string]any{"id": m.ID}
-			if m.Alias != "" {
-				entry["alias"] = m.Alias
-			}
-			models = append(models, entry)
-		}
-		if len(models) > 0 {
-			gw["models"] = models
-		}
-		providers = append(providers, gw)
-	}
-	for _, up := range b.Profile.Upstreams {
-		p := map[string]any{"id": up.Name, "name": up.Name}
-		if up.BaseURL != "" {
-			p["base_url"] = up.BaseURL
-		}
-		if up.APIKey != "" {
-			p["api_key"] = up.APIKey
-		}
-		providers = append(providers, p)
-	}
-
-	mcp := map[string]any{}
-	for _, s := range b.MCP.Servers {
-		entry := map[string]any{}
-		if s.Command != "" {
-			entry["command"] = s.Command
-		}
-		if len(s.Args) > 0 {
-			entry["args"] = s.Args
-		}
-		if s.URL != "" {
-			entry["url"] = s.URL
-		}
-		if s.Transport != "" {
-			entry["transport"] = s.Transport
-		}
-		if len(s.Env) > 0 {
-			entry["env"] = s.Env
-		}
-		mcp[s.Name] = entry
-	}
-
 	out := map[string]any{
-		"providers":     providers,
+		"providers":     common.BuildProviders(&b.Profile),
 		"default_model": b.Profile.Gateway.DefaultModel,
 	}
-	if len(mcp) > 0 {
+	if mcp := common.BuildMCPMap(&b.MCP); len(mcp) > 0 {
 		out["mcpServers"] = mcp
 	}
 	return render.JSON(out)