mirror of
https://github.com/lukaszraczylo/harness-sync.git
synced 2026-10-15 01:07:27 +00:00
fix: propagate gateway token; kilo targets opencode.jsonc; goose URL + api_key fix
This commit is contained in:
@@ -2,6 +2,8 @@
|
||||
package kilo
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"maps"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
@@ -106,6 +108,52 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
||||
Content: merged,
|
||||
})
|
||||
|
||||
// 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.
|
||||
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.
|
||||
if newProv, ok := overlay["provider"].(map[string]any); ok && len(newProv) > 0 {
|
||||
existing, _ := ocBase["provider"].(map[string]any)
|
||||
if existing == nil {
|
||||
existing = map[string]any{}
|
||||
}
|
||||
maps.Copy(existing, newProv)
|
||||
ocOverlay["provider"] = existing
|
||||
}
|
||||
// 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
|
||||
}
|
||||
fs.Add(adapter.File{
|
||||
Dest: ocPath,
|
||||
Kind: adapter.RenderedFile,
|
||||
Content: ocMerged,
|
||||
NoMerge: true,
|
||||
})
|
||||
}
|
||||
|
||||
return fs, nil
|
||||
}
|
||||
|
||||
|
||||
@@ -128,6 +128,48 @@ func TestKiloRenderEmitsModelString(t *testing.T) {
|
||||
assert.Equal(t, "https://gw", opts["baseURL"])
|
||||
}
|
||||
|
||||
func TestKiloRenderMergesOpenCodeJSONC(t *testing.T) {
|
||||
home := t.TempDir()
|
||||
base := filepath.Join(home, ".config", "kilo")
|
||||
require.NoError(t, os.MkdirAll(base, 0o750))
|
||||
|
||||
// Existing opencode.jsonc with a filter and a different provider.
|
||||
existing := `{
|
||||
"enabled_providers": ["llmgw"],
|
||||
"provider": {
|
||||
"llmgw": {"npm": "@ai-sdk/openai-compatible", "options": {"baseURL": "https://old"}}
|
||||
},
|
||||
"model": "llmgw/old-model"
|
||||
}`
|
||||
require.NoError(t, os.WriteFile(filepath.Join(base, "opencode.jsonc"), []byte(existing), 0o600))
|
||||
|
||||
ad := New(WithHome(home))
|
||||
b := &canonical.Bundle{
|
||||
Profile: canonical.Profile{
|
||||
Gateway: canonical.Gateway{URL: "https://gw", Token: "dummy", DefaultModel: "sonnet"},
|
||||
Models: []canonical.Model{{ID: "claude-sonnet-4-6", Alias: "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 })
|
||||
|
||||
ocDest := filepath.Join(base, "opencode.jsonc")
|
||||
require.Contains(t, seen, ocDest)
|
||||
|
||||
var parsed map[string]any
|
||||
require.NoError(t, json.Unmarshal(seen[ocDest].Content, &parsed))
|
||||
// enabled_providers deleted so our provider is visible.
|
||||
assert.NotContains(t, parsed, "enabled_providers")
|
||||
// llmgw preserved, harness-sync-gateway added.
|
||||
provider := parsed["provider"].(map[string]any)
|
||||
assert.Contains(t, provider, "llmgw")
|
||||
assert.Contains(t, provider, "harness-sync-gateway")
|
||||
// model updated.
|
||||
assert.Equal(t, "harness-sync-gateway/sonnet", parsed["model"])
|
||||
}
|
||||
|
||||
func TestKiloImport(t *testing.T) {
|
||||
home := t.TempDir()
|
||||
base := filepath.Join(home, ".config", "kilo")
|
||||
|
||||
Reference in New Issue
Block a user