lukaszraczylo/harness-sync
1
0
Fork 0
mirror of https://github.com/lukaszraczylo/harness-sync.git synced 2026-10-13 00:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove dead code, deduplicate defaultHome, simplify mcpEntry + kilo render

Browse Source 
Dead code removed:
- BuildProviders, buildModels, ProviderEntry (no production callers)
- ZedLanguageModels (shadowed by adapter-local version, wrong schema)
- GatewayProviderID deprecated constant (zero references)
- Corresponding dead tests for BuildProviders

Deduplication:
- Extract common.DefaultHome() to internal/adapter/common/home.go
- All 7 adapters call common.DefaultHome() instead of local copies (-49 lines)

Simplification:
- mcp.go: merge MCPClaudeStyle/MCPCrushStyle branches (identical URL path,
  one-line difference in stdio path) — clearer intent, fewer lines
- kilo.go: extract opencode.jsonc merge to mergeOpenCodeJSONC() helper,
  Render() drops from 92 to ~55 lines
- goose.go: strings.IndexByte → strings.Cut in splitProviderModel
This commit is contained in:
lukaszraczylo
2026-05-23 21:22:49 +01:00
parent 21a86c084f
commit 6483eb8044
11 changed files with 68 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/adapters/cagent/cagent.go
+1 -9
View File
@@ -29,21 +29,13 @@ func WithHome(h string) Option { return func(a *Adapter) { a.home = h } }
// New returns a new Adapter with the given options applied.
func New(opts ...Option) *Adapter {
a := &Adapter{home: defaultHome()}
a := &Adapter{home: common.DefaultHome()}
for _, o := range opts {
o(a)
}
return a
}
func defaultHome() string {
h, err := os.UserHomeDir()
if err != nil {
return ""
}
return h
}
// Name returns the harness identifier.
func (a *Adapter) Name() string { return name }
internal/adapters/claudecode/claudecode.go
+1 -9
View File
@@ -25,21 +25,13 @@ func WithHome(h string) Option { return func(a *Adapter) { a.home = h } }
// New returns a new Adapter with the given options applied.
func New(opts ...Option) *Adapter {
a := &Adapter{home: defaultHome()}
a := &Adapter{home: common.DefaultHome()}
for _, o := range opts {
o(a)
}
return a
}
func defaultHome() string {
h, err := os.UserHomeDir()
if err != nil {
return ""
}
return h
}
// Name returns the harness identifier.
func (a *Adapter) Name() string { return name }
internal/adapters/crush/crush.go
+1 -9
View File
@@ -23,21 +23,13 @@ func WithHome(h string) Option { return func(a *Adapter) { a.home = h } }
// New returns a new Adapter with the given options applied.
func New(opts ...Option) *Adapter {
a := &Adapter{home: defaultHome()}
a := &Adapter{home: common.DefaultHome()}
for _, o := range opts {
o(a)
}
return a
}
func defaultHome() string {
h, err := os.UserHomeDir()
if err != nil {
return ""
}
return h
}
// Name returns the harness identifier.
func (a *Adapter) Name() string { return name }
internal/adapters/goose/goose.go
+3 -11
View File
@@ -32,21 +32,13 @@ func WithHome(h string) Option { return func(a *Adapter) { a.home = h } }
// New returns a new Adapter with the given options applied.
func New(opts ...Option) *Adapter {
a := &Adapter{home: defaultHome()}
a := &Adapter{home: common.DefaultHome()}
for _, o := range opts {
o(a)
}
return a
}
func defaultHome() string {
h, err := os.UserHomeDir()
if err != nil {
return ""
}
return h
}
// Name returns the harness identifier.
func (a *Adapter) Name() string { return name }
@@ -152,8 +144,8 @@ func buildExtensions(servers []canonical.MCPServer) map[string]any {
// splitProviderModel splits "provider/model" into its parts.
// If no slash, provider is "anthropic" and the whole string is the model.
func splitProviderModel(s string) (string, string) {
if idx := strings.IndexByte(s, '/'); idx >= 0 {
return s[:idx], s[idx+1:]
if p, m, ok := strings.Cut(s, "/"); ok {
return p, m
}
return "anthropic", s
}
internal/adapters/kilo/kilo.go
+41 -49
View File
@@ -27,21 +27,13 @@ func WithHome(h string) Option { return func(a *Adapter) { a.home = h } }
// New returns a new Adapter with the given options applied.
func New(opts ...Option) *Adapter {
a := &Adapter{home: defaultHome()}
a := &Adapter{home: common.DefaultHome()}
for _, o := range opts {
o(a)
}
return a
}
func defaultHome() string {
h, err := os.UserHomeDir()
if err != nil {
return ""
}
return h
}
// Name returns the harness identifier.
func (a *Adapter) Name() string { return name }
@@ -110,50 +102,15 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
// Also merge into opencode.jsonc when present — kilo reads it as its
// primary config. Delete the enabled_providers filter so our provider is
// visible alongside user-defined providers. Deep-merge the provider map
// so existing providers (e.g. "llmgw") are preserved.
// visible alongside user-defined providers.
ocPath := filepath.Join(base, "opencode.jsonc")
if ocRaw, readErr := os.ReadFile(ocPath); readErr == nil {
// Parse existing content (supports JSONC comments internally).
var ocBase map[string]any
clean := common.StripJSONComments(string(ocRaw))
_ = json.Unmarshal([]byte(clean), &ocBase)
if ocBase == nil {
ocBase = map[string]any{}
}
ocOverlay := map[string]any{
"enabled_providers": nil, // delete filter
}
// Deep-merge provider: add our entries INTO the existing provider map,
// then absorb any duplicate providers that share the same gateway URL.
if newProv, ok := overlay["provider"].(map[string]any); ok && len(newProv) > 0 {
existingProv, _ := ocBase["provider"].(map[string]any)
if existingProv == nil {
existingProv = map[string]any{}
}
maps.Copy(existingProv, newProv)
// Absorb providers at the same URL into harness-sync-gateway,
// preserving user-crafted display names and custom limits.
merged := common.AbsorbDuplicateProviders(existingProv, common.GatewayProviderKey(b.Profile.Gateway.URL), b.Profile.Gateway.URL)
ocOverlay["provider"] = merged
}
// Copy model/small_model/mcp from the kilo.json overlay.
for _, k := range []string{"model", "small_model", "mcp"} {
if v, ok := overlay[k]; ok {
ocOverlay[k] = v
}
}
ocMerged, mergeErr := common.MergeJSONKeys([]byte(clean), ocOverlay)
if mergeErr != nil {
return nil, mergeErr
}
if ocContent, mergeErr := mergeOpenCodeJSONC(ocPath, overlay, b.Profile.Gateway.URL); mergeErr != nil {
return nil, mergeErr
} else if ocContent != nil {
fs.Add(adapter.File{
Dest: ocPath,
Kind: adapter.RenderedFile,
Content: ocMerged,
Content: ocContent,
NoMerge: true,
})
}
@@ -161,6 +118,41 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
return fs, nil
}
// mergeOpenCodeJSONC deep-merges our overlay into the existing opencode.jsonc
// file, deleting the enabled_providers filter and deduplicating gateway providers.
// Returns nil content (no error) when the file does not exist.
func mergeOpenCodeJSONC(path string, overlay map[string]any, gatewayURL string) ([]byte, error) {
ocRaw, err := os.ReadFile(path)
if err != nil {
return nil, nil //nolint:nilerr // file absent is not an error
}
var ocBase map[string]any
clean := common.StripJSONComments(string(ocRaw))
_ = json.Unmarshal([]byte(clean), &ocBase)
if ocBase == nil {
ocBase = map[string]any{}
}
ocOverlay := map[string]any{"enabled_providers": nil}
if newProv, ok := overlay["provider"].(map[string]any); ok && len(newProv) > 0 {
existingProv, _ := ocBase["provider"].(map[string]any)
if existingProv == nil {
existingProv = map[string]any{}
}
maps.Copy(existingProv, newProv)
ocOverlay["provider"] = common.AbsorbDuplicateProviders(existingProv, common.GatewayProviderKey(gatewayURL), gatewayURL)
}
for _, k := range []string{"model", "small_model", "mcp"} {
if v, ok := overlay[k]; ok {
ocOverlay[k] = v
}
}
return common.MergeJSONKeys([]byte(clean), ocOverlay)
}
// Import reads kilo config from home and returns a canonical ImportResult.
func (a *Adapter) Import(home string) (*adapter.ImportResult, error) {
return importFrom(home)
internal/adapters/opencode/opencode.go
+1 -9
View File
@@ -24,21 +24,13 @@ func WithHome(h string) Option { return func(a *Adapter) { a.home = h } }
// New returns a new Adapter with the given options applied.
func New(opts ...Option) *Adapter {
a := &Adapter{home: defaultHome()}
a := &Adapter{home: common.DefaultHome()}
for _, o := range opts {
o(a)
}
return a
}
func defaultHome() string {
h, err := os.UserHomeDir()
if err != nil {
return ""
}
return h
}
// Name returns the harness identifier.
func (a *Adapter) Name() string { return name }
internal/adapters/zed/zed.go
+1 -9
View File
@@ -28,21 +28,13 @@ func WithHome(h string) Option { return func(a *Adapter) { a.home = h } }
// New returns a new Adapter with the given options applied.
func New(opts ...Option) *Adapter {
a := &Adapter{home: defaultHome()}
a := &Adapter{home: common.DefaultHome()}
for _, o := range opts {
o(a)
}
return a
}
func defaultHome() string {
h, err := os.UserHomeDir()
if err != nil {
return ""
}
return h
}
// Name returns the harness identifier.
func (a *Adapter) Name() string { return name }