mirror of
https://github.com/lukaszraczylo/harness-sync.git
synced 2026-10-12 00:45:22 +00:00
Three robustness fixes for the apply pipeline:
1. Silent read errors on state/target files treated 'file absent' as
'file empty' and fast-forward-overwrote user edits. Add
common.ReadExistingFile that returns (nil,nil) only on
os.IsNotExist; other I/O errors propagate. Use it from apply.Run
and from every adapter's Render (claudecode, crush, kilo,
opencode, goose, zed).
2. apply.Run required callers to pre-construct *gitx.Repo; passing
nil silently skipped the commit. Run now auto-opens a repo from
Bundle.Root, gracefully no-ops when the root is not a git repo,
and uses a new gitx.HasStagedChanges() check to skip the no-op
'nothing to commit' that triggered the original silent-skip.
3. Each of 7 adapter packages re-implemented the same 25-line
Option/WithHome/New constructor. Hoist into adapter.Base +
adapter.BaseOption + NewBase. Each adapter embeds *Base and
reduces to a 9-line constructor. Public New(WithHome(h)) API
preserved; a.home becomes a.Home.
Tests:
- apply: 5 new (propagates-read-error, auto-opens-repo,
no-repo-skips-commit, skips-no-op-commit, commit-message-counts)
- gitx: 2 new (HasStagedChanges empty/after-add)
- adapter/common: 3 new (ReadExistingFile missing/content/perm)
- adapter: 4 new (NewBase default/WithHome/order/typed)
- existing adapter tests unchanged — verify a.Home still honoured.
157 lines
4.8 KiB
Go
157 lines
4.8 KiB
Go
// Package kilo is the kilo harness adapter.
|
|
package kilo
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"maps"
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"github.com/lukaszraczylo/harness-sync/internal/adapter"
|
|
"github.com/lukaszraczylo/harness-sync/internal/adapter/common"
|
|
"github.com/lukaszraczylo/harness-sync/internal/canonical"
|
|
)
|
|
|
|
const name = "kilo"
|
|
|
|
// Adapter implements adapter.Adapter for the kilo harness.
|
|
type Adapter struct {
|
|
*adapter.Base
|
|
}
|
|
|
|
// WithHome overrides the home directory used to resolve target paths.
|
|
func WithHome(h string) adapter.BaseOption { return func(b *adapter.Base) { b.Home = h } }
|
|
|
|
// New returns a new Adapter with the given options applied.
|
|
func New(opts ...adapter.BaseOption) *Adapter {
|
|
return &Adapter{Base: adapter.NewBase(opts...)}
|
|
}
|
|
|
|
// Name returns the harness identifier.
|
|
func (a *Adapter) Name() string { return name }
|
|
|
|
// Capabilities declares what kilo harness-sync manages.
|
|
func (a *Adapter) Capabilities() adapter.HarnessCapabilities {
|
|
return adapter.HarnessCapabilities{
|
|
ManagesProviders: true,
|
|
ManagesModels: true,
|
|
ManagesMCP: true,
|
|
ManagesSkills: true,
|
|
ManagesInstructions: false,
|
|
HasBuiltInSub: false,
|
|
}
|
|
}
|
|
|
|
// Detect returns true when ~/.config/kilo exists.
|
|
func (a *Adapter) Detect() bool {
|
|
_, err := os.Stat(filepath.Join(a.Home, ".config", "kilo"))
|
|
return err == nil
|
|
}
|
|
|
|
// Render produces the FileSet that applies the canonical bundle to kilo.
|
|
// kilo.json is MERGED to preserve user-managed keys ($schema, small_model,
|
|
// instructions, permission, compaction, watcher, formatter, skills).
|
|
// Key "model" is a plain string; MCP uses "mcp" with local/remote type entries.
|
|
// No "providers" key — kilo has no such concept.
|
|
func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
|
|
fs := adapter.NewFileSet()
|
|
base := filepath.Join(a.Home, ".config", "kilo")
|
|
|
|
fs.Add(adapter.File{
|
|
Dest: filepath.Join(base, "agent"),
|
|
Kind: adapter.SymlinkDir,
|
|
SymlinkTarget: filepath.Join(b.Root, "agents"),
|
|
})
|
|
// kilo reads skills from ~/.kilo/skills/<name>/SKILL.md
|
|
fs.Add(adapter.File{
|
|
Dest: filepath.Join(a.Home, ".kilo", "skills"),
|
|
Kind: adapter.SymlinkDir,
|
|
SymlinkTarget: filepath.Join(b.Root, "skills"),
|
|
})
|
|
|
|
cfgPath := filepath.Join(base, "kilo.json")
|
|
existing, err := common.ReadExistingFile(cfgPath)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("read %s: %w", cfgPath, err)
|
|
}
|
|
modelStr := common.KiloModelString(&b.Profile)
|
|
overlay := map[string]any{}
|
|
if providers := common.ProvidersAsMap(&b.Profile); len(providers) > 0 {
|
|
overlay["provider"] = providers
|
|
}
|
|
if modelStr != "" {
|
|
overlay["model"] = modelStr
|
|
overlay["small_model"] = modelStr
|
|
}
|
|
if mcp := common.BuildMCPMapStyled(&b.MCP, common.MCPOpencodeStyle); len(mcp) > 0 {
|
|
overlay["mcp"] = mcp
|
|
}
|
|
merged, err := common.MergeJSONKeys(existing, overlay)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
fs.Add(adapter.File{
|
|
Dest: cfgPath,
|
|
Kind: adapter.RenderedFile,
|
|
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.
|
|
ocPath := filepath.Join(base, "opencode.jsonc")
|
|
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: ocContent,
|
|
NoMerge: true,
|
|
})
|
|
}
|
|
|
|
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)
|
|
}
|