diff --git a/go/core/internal/httpserver/handlers/models.go b/go/core/internal/httpserver/handlers/models.go
index b516a1b97..e7b7b1e33 100644
--- a/go/core/internal/httpserver/handlers/models.go
+++ b/go/core/internal/httpserver/handlers/models.go
@@ -31,38 +31,55 @@ func (h *ModelHandler) HandleListSupportedModels(w ErrorResponseWriter, r *http.
 			{Name: "gpt-5", FunctionCalling: true},
 			{Name: "gpt-5-mini", FunctionCalling: true},
 			{Name: "gpt-5-nano", FunctionCalling: true},
+			{Name: "gpt-4.1", FunctionCalling: true},
+			{Name: "gpt-4.1-mini", FunctionCalling: true},
+			{Name: "gpt-4.1-nano", FunctionCalling: true},
 			{Name: "gpt-4o", FunctionCalling: true},
+			{Name: "gpt-4o-mini", FunctionCalling: true},
+			{Name: "o3", FunctionCalling: true},
+			{Name: "o3-mini", FunctionCalling: true},
 			{Name: "o4-mini", FunctionCalling: true},
 			{Name: "gpt-4-turbo", FunctionCalling: true},
 			{Name: "gpt-4", FunctionCalling: true},
 			{Name: "gpt-3.5-turbo", FunctionCalling: true},
 		},
 		v1alpha2.ModelProviderAnthropic: {
+			{Name: "claude-opus-4-6", FunctionCalling: true},
+			{Name: "claude-sonnet-4-6", FunctionCalling: true},
+			{Name: "claude-haiku-4-5", FunctionCalling: true},
 			{Name: "claude-opus-4-1-20250805", FunctionCalling: true},
 			{Name: "claude-opus-4-20250514", FunctionCalling: true},
 			{Name: "claude-sonnet-4-20250514", FunctionCalling: true},
+			{Name: "claude-sonnet-4-5", FunctionCalling: true},
 			{Name: "claude-3-7-sonnet-20250219", FunctionCalling: true},
 			{Name: "claude-3-5-sonnet-20240620", FunctionCalling: true},
-			{Name: "claude-sonnet-4-5", FunctionCalling: true},
 		},
 		v1alpha2.ModelProviderAzureOpenAI: {
-			{Name: "gpt-4", FunctionCalling: true},
-			{Name: "gpt-35-turbo", FunctionCalling: true},
-			{Name: "gpt-oss-120b", FunctionCalling: true},
+			{Name: "gpt-5", FunctionCalling: true},
+			{Name: "gpt-5-mini", FunctionCalling: true},
+			{Name: "gpt-5-nano", FunctionCalling: true},
 			{Name: "gpt-4.1", FunctionCalling: true},
 			{Name: "gpt-4.1-mini", FunctionCalling: true},
 			{Name: "gpt-4.1-nano", FunctionCalling: true},
 			{Name: "gpt-4o", FunctionCalling: true},
-			{Name: "gpt-4o-mini", FunctionCalling: true}, {Name: "o4-mini", FunctionCalling: true},
+			{Name: "gpt-4o-mini", FunctionCalling: true},
+			{Name: "o4-mini", FunctionCalling: true},
 			{Name: "o3", FunctionCalling: true},
 			{Name: "o3-mini", FunctionCalling: true},
+			{Name: "gpt-4", FunctionCalling: true},
+			{Name: "gpt-35-turbo", FunctionCalling: true},
+			{Name: "gpt-oss-120b", FunctionCalling: true},
 		},
 		v1alpha2.ModelProviderOllama: {
+			{Name: "llama3.3", FunctionCalling: false},
+			{Name: "llama3.1", FunctionCalling: false},
+			{Name: "qwen2.5-coder", FunctionCalling: false},
+			{Name: "deepseek-r1", FunctionCalling: false},
+			{Name: "mistral", FunctionCalling: false},
+			{Name: "mixtral", FunctionCalling: false},
 			{Name: "llama2", FunctionCalling: false},
 			{Name: "llama2:13b", FunctionCalling: false},
 			{Name: "llama2:70b", FunctionCalling: false},
-			{Name: "mistral", FunctionCalling: false},
-			{Name: "mixtral", FunctionCalling: false},
 		},
 		v1alpha2.ModelProviderGemini: {
 			{Name: "gemini-2.5-pro", FunctionCalling: true},