fix(adapters): emit correct provider/model schema per harness

This commit is contained in:
2026-05-23 12:48:10 +01:00
parent 941b1d86c3
commit da49624b99
15 changed files with 556 additions and 46 deletions
@@ -78,6 +78,29 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
Content: []byte(instructions),
})
// settings.json holds the gateway env vars + model override.
// Only emit when a gateway URL is configured.
if b.Profile.Gateway.URL != "" {
settingsPath := filepath.Join(base, "settings.json")
settingsExisting, _ := os.ReadFile(settingsPath)
settingsOverlay := map[string]any{
"model": b.Profile.Gateway.DefaultModel,
"env": map[string]any{
"ANTHROPIC_BASE_URL": b.Profile.Gateway.URL,
"ANTHROPIC_AUTH_TOKEN": b.Profile.Gateway.Token,
},
}
settingsMerged, err := common.MergeJSONKeys(settingsExisting, settingsOverlay)
if err != nil {
return nil, err
}
fs.Add(adapter.File{
Dest: settingsPath,
Kind: adapter.RenderedFile,
Content: settingsMerged,
})
}
// Claude Code reads MCP servers from two files on disk:
// * ~/.claude.json (live, written by `claude mcp add`)
// * ~/.claude/mcp_servers.json (older / fallback location)
@@ -94,6 +94,53 @@ func TestRenderMergesLiveClaudeJSON(t *testing.T) {
assert.Equal(t, "stdio", fp["type"])
}
func TestClaudeCodeRenderSetsAnthropicBaseURLInSettings(t *testing.T) {
home := t.TempDir()
ad := New(WithHome(home))
b := &canonical.Bundle{
Root: "/canon",
Profile: canonical.Profile{
Gateway: canonical.Gateway{
URL: "https://gw",
Token: "tok",
DefaultModel: "claude-sonnet-4-6",
},
},
}
fs, err := ad.Render(b)
require.NoError(t, err)
seen := map[string]adapter.File{}
fs.ForEach(func(f adapter.File) { seen[f.Dest] = f })
settingsDest := filepath.Join(home, ".claude", "settings.json")
require.Contains(t, seen, settingsDest)
assert.Equal(t, adapter.RenderedFile, seen[settingsDest].Kind)
var parsed map[string]any
require.NoError(t, json.Unmarshal(seen[settingsDest].Content, &parsed))
assert.Equal(t, "claude-sonnet-4-6", parsed["model"])
env, ok := parsed["env"].(map[string]any)
require.True(t, ok, "env must be a map")
assert.Equal(t, "https://gw", env["ANTHROPIC_BASE_URL"])
assert.Equal(t, "tok", env["ANTHROPIC_AUTH_TOKEN"])
}
func TestClaudeCodeRenderNoGatewayNoSettings(t *testing.T) {
home := t.TempDir()
ad := New(WithHome(home))
b := &canonical.Bundle{
Root: "/canon",
Profile: canonical.Profile{},
}
fs, err := ad.Render(b)
require.NoError(t, err)
seen := map[string]adapter.File{}
fs.ForEach(func(f adapter.File) { seen[f.Dest] = f })
settingsDest := filepath.Join(home, ".claude", "settings.json")
assert.NotContains(t, seen, settingsDest, "settings.json must not be written when no gateway URL")
}
func TestImport(t *testing.T) {
home := t.TempDir()
base := filepath.Join(home, ".claude")