feat: URL-derived provider keys (hs-<hostname>) + dedup providers sharing same gateway URL

- GatewayProviderKey() derives stable key from gateway URL hostname
  e.g. https://llmgw.h.raczylo.com/v1 → hs-llmgw-h-raczylo-com
- AbsorbDuplicateProviders() merges providers sharing the same baseURL
  into our canonical entry; user-crafted model metadata wins for overlaps
- kilo: renders to opencode.jsonc (primary config), deep-merges providers,
  deletes enabled_providers filter that was hiding our gateway
- opencode: absorbs duplicate providers from existing config
- All adapters use GatewayProviderKey() instead of hardcoded string
- Fix goose URL doubling (was /v1/v1/chat/completions → /chat/completions)
- Fix token propagation: api_key written directly (not env var ref)
- Zed: adds prompt_cache_key capability, deletes context_servers key
  to avoid ContextServerSettingsContent serde untagged-enum parse error
This commit is contained in:
2026-05-23 21:13:16 +01:00
parent 77158d9f2b
commit fb02b165d7
16 changed files with 180 additions and 57 deletions
+4 -6
View File
@@ -89,11 +89,9 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
mcps[s.Name] = e
}
provKey := common.GatewayProviderKey(b.Profile.Gateway.URL)
// inline model shorthand: "providerID/modelID"
modelRef := ""
if b.Profile.Gateway.DefaultModel != "" {
modelRef = "harness-sync-gateway/" + b.Profile.Gateway.DefaultModel
}
modelRef := common.KiloModelString(&b.Profile)
cfg := map[string]any{
"version": 8,
@@ -108,8 +106,8 @@ func (a *Adapter) Render(b *canonical.Bundle) (*adapter.FileSet, error) {
},
"providers": common.ProvidersAsCagentMap(&b.Profile),
"models": map[string]any{
"harness-sync-gateway": map[string]any{
"provider": "harness-sync-gateway",
provKey: map[string]any{
"provider": provKey,
"model": b.Profile.Gateway.DefaultModel,
},
},
+6 -6
View File
@@ -48,20 +48,20 @@ func TestCagentRenderProducesExpectedTargets(t *testing.T) {
agents := parsed["agents"].(map[string]any)
def := agents["default"].(map[string]any)
assert.Equal(t, "harness-sync-gateway/claude-sonnet-4-6", def["model"])
assert.Equal(t, "hs-gw/claude-sonnet-4-6", def["model"])
assert.Contains(t, def["instruction"], "# global instruction")
// providers map (new schema).
providers := parsed["providers"].(map[string]any)
gwProv := providers["harness-sync-gateway"].(map[string]any)
gwProv := providers["hs-gw"].(map[string]any)
assert.Equal(t, "https://gw", gwProv["base_url"])
assert.Equal(t, "openai", gwProv["provider"])
assert.NotContains(t, gwProv, "token_key")
// models map.
models := parsed["models"].(map[string]any)
gw := models["harness-sync-gateway"].(map[string]any)
assert.Equal(t, "harness-sync-gateway", gw["provider"])
gw := models["hs-gw"].(map[string]any)
assert.Equal(t, "hs-gw", gw["provider"])
assert.Equal(t, "claude-sonnet-4-6", gw["model"])
mcps := parsed["mcps"].(map[string]any)
@@ -93,7 +93,7 @@ func TestCagentRenderProvidersAndModelsMaps(t *testing.T) {
// providers block present.
providers, ok := parsed["providers"].(map[string]any)
require.True(t, ok, "providers must be a map")
gw, ok := providers["harness-sync-gateway"].(map[string]any)
gw, ok := providers["hs-gw"].(map[string]any)
require.True(t, ok)
assert.Equal(t, "https://gw", gw["base_url"])
assert.Equal(t, "tok", gw["api_key"])
@@ -103,7 +103,7 @@ func TestCagentRenderProvidersAndModelsMaps(t *testing.T) {
// agents.default.model uses inline shorthand.
agents := parsed["agents"].(map[string]any)
def := agents["default"].(map[string]any)
assert.Equal(t, "harness-sync-gateway/claude-sonnet-4-6", def["model"])
assert.Equal(t, "hs-gw/claude-sonnet-4-6", def["model"])
}
func TestCagentRenderNoMCP(t *testing.T) {