git.iko.soy/crush
on main help sign in
feat(agent): add support for azure provider
commitcb946b7e9250106188b377e1f91df9703831e8db authorkujtimiihoxha <kujtimii.h@gmail.com> dateFri 10 Oct 2025, 13:52 (1 year ago) parentb3d2319
4 files changed+48−7
compare with main
unifiedsplit
go.mod+6−2 go.sum+14−3 internal/agent/common_test.go+1−1 internal/agent/coordinator.go+27−1
go.mod+6−2
@@ -15,7 +15,7 @@ require (
1515 github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.4.0.20250910155747-997384b0b35e
1616 github.com/charmbracelet/catwalk v0.6.5-0.20251010111259-a1bafd2530bb
1717 github.com/charmbracelet/fang v0.4.2
18− github.com/charmbracelet/fantasy v0.0.0-20251003071236-5d39f0348e5d
18+ github.com/charmbracelet/fantasy v0.0.0-20251010114724-801d5df11cef
1919 github.com/charmbracelet/glamour/v2 v2.0.0-20250811143442-a27abb32f018
2020 github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20250917201909-41ff0bf215ea
2121 github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706
@@ -47,6 +47,11 @@ require (
4747 mvdan.cc/sh/v3 v3.12.1-0.20250902163504-3cf4fd5717a5
4848)
4949
50+require (
51+ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect
52+ github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
53+)
54+
5055require (
5156 cloud.google.com/go v0.116.0 // indirect
5257 cloud.google.com/go/auth v0.9.3 // indirect
@@ -133,7 +138,6 @@ require (
133138 google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
134139 google.golang.org/grpc v1.66.2 // indirect
135140 google.golang.org/protobuf v1.36.8 // indirect
136− gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
137141 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
138142 gopkg.in/yaml.v3 v3.0.1 // indirect
139143 mvdan.cc/sh/moreinterp v0.0.0-20250902163504-3cf4fd5717a5
go.sum+14−3
@@ -5,6 +5,14 @@ cloud.google.com/go/auth v0.9.3 h1:VOEUIAADkkLtyfr3BLa3R8Ed/j6w1jTBmARx+wb5w5U=
55cloud.google.com/go/auth v0.9.3/go.mod h1:7z6VY+7h3KUdRov5F1i8NDP5ZzWKYmEPO842BgCsmTk=
66cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY=
77cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY=
8+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WWFYBlX1CPTrR+NDToRkQ=
9+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0/go.mod h1:XCW7KnZet0Opnr7HccfUw1PLc4CjHqpcaxW8DHklNkQ=
10+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 h1:tfLQ34V6F7tVSwoTf/4lH5sE0o6eCJuNDTmH09nDpbc=
11+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg=
12+github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY=
13+github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY=
14+github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU=
15+github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
816github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
917github.com/JohannesKaufmann/html-to-markdown v1.6.0 h1:04VXMiE50YYfCfLboJCLcgqF5x+rHJnb1ssNmqpLH/k=
1018github.com/JohannesKaufmann/html-to-markdown v1.6.0/go.mod h1:NUI78lGg/a7vpEJTz/0uOcYMaibytE4BUOQS8k78yPQ=
@@ -51,8 +59,8 @@ github.com/charmbracelet/colorprofile v0.3.2 h1:9J27WdztfJQVAQKX2WOlSSRB+5gaKqqI
5159github.com/charmbracelet/colorprofile v0.3.2/go.mod h1:mTD5XzNeWHj8oqHb+S1bssQb7vIHbepiebQ2kPKVKbI=
5260github.com/charmbracelet/fang v0.4.2 h1:nWr7Tb82/TTNNGMGG35aTZ1X68loAOQmpb0qxkKXjas=
5361github.com/charmbracelet/fang v0.4.2/go.mod h1:wHJKQYO5ReYsxx+yZl+skDtrlKO/4LLEQ6EXsdHhRhg=
54−github.com/charmbracelet/fantasy v0.0.0-20251003071236-5d39f0348e5d h1:HS9qu7CgQGPnPcNoHIZXGWGFS8SaxaBXYytLdakm+jY=
55−github.com/charmbracelet/fantasy v0.0.0-20251003071236-5d39f0348e5d/go.mod h1:RZotHpq44tKZDe6Vf0kk1iDqnUgH7Scx+K/7uJ9Qwnw=
62+github.com/charmbracelet/fantasy v0.0.0-20251010114724-801d5df11cef h1:4GmaYNj/NifjXbW6K3QExrCuiRpoNMWAlJESzmppdGU=
63+github.com/charmbracelet/fantasy v0.0.0-20251010114724-801d5df11cef/go.mod h1:3XBTxXYYvBX1UsKa5FHicJUQJkoHHmUjXRfr0BcqV4A=
5664github.com/charmbracelet/glamour/v2 v2.0.0-20250811143442-a27abb32f018 h1:PU4Zvpagsk5sgaDxn5W4sxHuLp9QRMBZB3bFSk40A4w=
5765github.com/charmbracelet/glamour/v2 v2.0.0-20250811143442-a27abb32f018/go.mod h1:Z/GLmp9fzaqX4ze3nXG7StgWez5uBM5XtlLHK8V/qSk=
5866github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20250917201909-41ff0bf215ea h1:g1HfUgSMvye8mgecMD1mPscpt+pzJoDEiSA+p2QXzdQ=
@@ -114,6 +122,8 @@ github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7
114122github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
115123github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
116124github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
125+github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
126+github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
117127github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
118128github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
119129github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
@@ -167,7 +177,6 @@ github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02
167177github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
168178github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
169179github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
170−github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
171180github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
172181github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
173182github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -218,6 +227,8 @@ github.com/openai/openai-go/v2 v2.3.0 h1:y9U+V1tlHjvvb/5XIswuySqnG5EnKBFAbMxgBvT
218227github.com/openai/openai-go/v2 v2.3.0/go.mod h1:sIUkR+Cu/PMUVkSKhkk742PRURkQOCFhiwJ7eRSBqmk=
219228github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
220229github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
230+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
231+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
221232github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
222233github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
223234github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
internal/agent/common_test.go+1−1
@@ -79,7 +79,7 @@ func openRouterBuilder(model string) builderFunc {
7979func zAIBuilder(model string) builderFunc {
8080 return func(t *testing.T, r *recorder.Recorder) (ai.LanguageModel, error) {
8181 provider := openaicompat.New(
82− "https://api.z.ai/api/coding/paas/v4",
82+ openaicompat.WithBaseURL("https://api.z.ai/api/coding/paas/v4"),
8383 openaicompat.WithAPIKey(os.Getenv("CRUSH_ZAI_API_KEY")),
8484 openaicompat.WithHTTPClient(&http.Client{Transport: r}),
8585 )
internal/agent/coordinator.go+27−1
@@ -19,6 +19,7 @@ import (
1919 "github.com/charmbracelet/crush/internal/session"
2020 "github.com/charmbracelet/fantasy/ai"
2121 "github.com/charmbracelet/fantasy/anthropic"
22+ "github.com/charmbracelet/fantasy/azure"
2223 "github.com/charmbracelet/fantasy/google"
2324 "github.com/charmbracelet/fantasy/openai"
2425 "github.com/charmbracelet/fantasy/openaicompat"
@@ -369,6 +370,7 @@ func (c *coordinator) buildOpenrouterProvider(_, apiKey string, headers map[stri
369370
370371func (c *coordinator) buildOpenaiCompatProvider(baseURL, apiKey string, headers map[string]string) ai.Provider {
371372 opts := []openaicompat.Option{
373+ openaicompat.WithBaseURL(baseURL),
372374 openaicompat.WithAPIKey(apiKey),
373375 }
374376 if c.cfg.Options.Debug {
@@ -379,7 +381,29 @@ func (c *coordinator) buildOpenaiCompatProvider(baseURL, apiKey string, headers
379381 opts = append(opts, openaicompat.WithHeaders(headers))
380382 }
381383
382− return openaicompat.New(baseURL, opts...)
384+ return openaicompat.New(opts...)
385+}
386+
387+func (c *coordinator) buildAzureProvider(baseURL, apiKey string, headers map[string]string, options map[string]string) ai.Provider {
388+ opts := []azure.Option{
389+ azure.WithBaseURL(baseURL),
390+ azure.WithAPIKey(apiKey),
391+ }
392+ if c.cfg.Options.Debug {
393+ httpClient := log.NewHTTPClient()
394+ opts = append(opts, azure.WithHTTPClient(httpClient))
395+ }
396+ if options == nil {
397+ options = make(map[string]string)
398+ }
399+ if apiVersion, ok := options["apiVersion"]; ok {
400+ opts = append(opts, azure.WithAPIVersion(apiVersion))
401+ }
402+ if len(headers) > 0 {
403+ opts = append(opts, azure.WithHeaders(headers))
404+ }
405+
406+ return azure.New(opts...)
383407}
384408
385409// TODO: add baseURL for google
@@ -435,6 +459,8 @@ func (c *coordinator) buildProvider(providerCfg config.ProviderConfig, model con
435459 provider = c.buildAnthropicProvider(baseURL, apiKey, headers)
436460 case openrouter.Name:
437461 provider = c.buildOpenrouterProvider(baseURL, apiKey, headers)
462+ case azure.Name:
463+ provider = c.buildAzureProvider(baseURL, apiKey, headers, providerCfg.ExtraParams)
438464 case google.Name:
439465 provider = c.buildGoogleProvider(baseURL, apiKey, headers)
440466 case openaicompat.Name: