chore: sync with upstream v0.34.3, preserve bedrock inference profile fixes

Author: puffitos

internal/providers/configs/bedrock.json

@@ -17,7 +17,8 @@
       "context_window": 1000000,
       "default_max_tokens": 64000,
       "can_reason": true,
-      "supports_attachments": true
+      "supports_attachments": true,
+      "regions": ["us", "eu", "jp", "au", "global"]
     },
     {
       "id": "anthropic.claude-sonnet-4-5-20250929-v1:0",
@@ -29,7 +30,8 @@
       "context_window": 200000,
       "default_max_tokens": 64000,
       "can_reason": true,
-      "supports_attachments": true
+      "supports_attachments": true,
+      "regions": ["us", "eu", "jp", "au", "global"]
     },
     {
       "id": "anthropic.claude-haiku-4-5-20251001-v1:0",
@@ -41,7 +43,8 @@
       "context_window": 200000,
       "default_max_tokens": 64000,
       "can_reason": false,
-      "supports_attachments": true
+      "supports_attachments": true,
+      "regions": ["us", "eu", "jp", "au", "global"]
     },
     {
       "id": "anthropic.claude-opus-4-6-v1",
@@ -53,7 +56,8 @@
       "context_window": 1000000,
       "default_max_tokens": 126000,
       "can_reason": true,
-      "supports_attachments": true
+      "supports_attachments": true,
+      "regions": ["us", "eu", "au", "global"]
     },
     {
       "id": "anthropic.claude-opus-4-5-20251101-v1:0",
@@ -65,19 +69,21 @@
       "context_window": 200000,
       "default_max_tokens": 64000,
       "can_reason": true,
-      "supports_attachments": true
+      "supports_attachments": true,
+      "regions": ["us", "eu", "global"]
     },
     {
-      "id": "anthropic.claude-opus-4-1-20250805-v1:0",
-      "name": "AWS Claude Opus 4.1",
-      "cost_per_1m_in": 15,
-      "cost_per_1m_out": 75,
-      "cost_per_1m_in_cached": 18.75,
-      "cost_per_1m_out_cached": 1.5,
+      "id": "anthropic.claude-sonnet-4-20250514-v1:0",
+      "name": "AWS Claude Sonnet 4",
+      "cost_per_1m_in": 3,
+      "cost_per_1m_out": 15,
+      "cost_per_1m_in_cached": 3.75,
+      "cost_per_1m_out_cached": 0.3,
       "context_window": 200000,
-      "default_max_tokens": 32000,
+      "default_max_tokens": 64000,
       "can_reason": true,
-      "supports_attachments": true
+      "supports_attachments": true,
+      "regions": ["us", "eu", "apac", "global"]
     },
     {
       "id": "anthropic.claude-opus-4-20250514-v1:0",
@@ -89,19 +95,21 @@
       "context_window": 200000,
       "default_max_tokens": 32000,
       "can_reason": true,
-      "supports_attachments": true
+      "supports_attachments": true,
+      "regions": ["us"]
     },
     {
-      "id": "anthropic.claude-sonnet-4-20250514-v1:0",
-      "name": "AWS Claude Sonnet 4",
-      "cost_per_1m_in": 3,
-      "cost_per_1m_out": 15,
-      "cost_per_1m_in_cached": 3.75,
-      "cost_per_1m_out_cached": 0.3,
+      "id": "anthropic.claude-opus-4-1-20250805-v1:0",
+      "name": "AWS Claude Opus 4.1",
+      "cost_per_1m_in": 15,
+      "cost_per_1m_out": 75,
+      "cost_per_1m_in_cached": 18.75,
+      "cost_per_1m_out_cached": 1.5,
       "context_window": 200000,
-      "default_max_tokens": 64000,
+      "default_max_tokens": 32000,
       "can_reason": true,
-      "supports_attachments": true
+      "supports_attachments": true,
+      "regions": ["us"]
     }
   ]
 }

internal/providers/providers.go

@@ -4,7 +4,11 @@ package providers
 import (
 	_ "embed"
 	"encoding/json"
+	"fmt"
 	"log"
+	"os"
+	"slices"
+	"strings"
 
 	"charm.land/catwalk/pkg/catwalk"
 )
@@ -170,7 +174,85 @@ func azureProvider() catwalk.Provider {
 }
 
 func bedrockProvider() catwalk.Provider {
-	return loadProviderFromConfig(bedrockConfig)
+	p := loadProviderFromConfig(bedrockConfig)
+
+	region := os.Getenv("AWS_REGION")
+	if region == "" {
+		region = os.Getenv("AWS_DEFAULT_REGION")
+	}
+
+	regionsByModelID, err := loadBedrockRegionsByModelID()
+	if err != nil {
+		log.Printf("Error loading bedrock regions: %v", err)
+		return catwalk.Provider{}
+	}
+
+	prefix := bedrockRegionPrefix(region)
+	origLarge := p.DefaultLargeModelID
+	origSmall := p.DefaultSmallModelID
+
+	resolved := make([]catwalk.Model, 0, len(p.Models))
+	for _, m := range p.Models {
+		id := m.ID
+		regions := regionsByModelID[id]
+
+		switch {
+		case slices.Contains(regions, prefix):
+			m.ID = prefix + "." + m.ID
+		case slices.Contains(regions, "global"):
+			m.ID = "global." + m.ID
+		default:
+			continue
+		}
+
+		if id == origLarge {
+			p.DefaultLargeModelID = m.ID
+		}
+		if id == origSmall {
+			p.DefaultSmallModelID = m.ID
+		}
+		resolved = append(resolved, m)
+	}
+	p.Models = resolved
+
+	return p
+}
+
+// bedrockRegionPrefix maps an AWS region to the inference profile prefix used
+// by Bedrock cross-region inference. Returns an empty string when the region
+// is unknown or unset, in which case the global profile is used as fallback.
+func bedrockRegionPrefix(region string) string {
+	switch {
+	case strings.HasPrefix(region, "us-") || region == "ca-central-1":
+		return "us"
+	case strings.HasPrefix(region, "eu-"):
+		return "eu"
+	case region == "ap-northeast-1":
+		return "jp"
+	case region == "ap-southeast-2":
+		return "au"
+	default:
+		return ""
+	}
+}
+
+func loadBedrockRegionsByModelID() (map[string][]string, error) {
+	var config struct {
+		Models []struct {
+			ID      string   `json:"id"`
+			Regions []string `json:"regions"`
+		} `json:"models"`
+	}
+
+	if err := json.Unmarshal(bedrockConfig, &config); err != nil {
+		return nil, fmt.Errorf("unmarshal bedrock config: %w", err)
+	}
+
+	regionsByModelID := make(map[string][]string, len(config.Models))
+	for _, model := range config.Models {
+		regionsByModelID[model.ID] = model.Regions
+	}
+	return regionsByModelID, nil
 }
 
 func vertexAIProvider() catwalk.Provider {