add select input, update model selection

Author: kah-seng

internal/api/chat/list_supported_models_v2.go

@@ -220,105 +220,62 @@ func (s *ChatServerV2) ListSupportedModels(
 		return nil, err
 	}
 
-	hasOwnAPIKey := strings.TrimSpace(settings.OpenAIAPIKey) != ""
-
 	var models []*chatv2.SupportedModel
 	for _, config := range allModels {
+		// Check if user has set API key for this particular model
+		hasOwnAPIKey := false
+		for _, model := range settings.CustomModels {
+			if model.Slug == config.slugOpenRouter {
+				// User has API key for this model, use slugOpenAI instead of slugOpenRouter if applicable
+				slug := config.slugOpenRouter
+				if strings.TrimSpace(config.slugOpenAI) != "" {
+					slug = config.slugOpenAI
+				}
+
+				models = append(models, &chatv2.SupportedModel{
+					Name:          model.Name,
+					Slug:          slug,
+					TotalContext:  int64(model.ContextWindow),
+					MaxOutput:     int64(model.MaxOutput),
+					InputPrice:    int64(model.InputPrice),
+					OutputPrice:   int64(model.OutputPrice),
+					CustomModelId: model.ID.Hex(),
+				})
+				hasOwnAPIKey = true
+				continue
+			}
+		}
+
+		if hasOwnAPIKey {
+			continue
+		}
+
 		// Choose the appropriate slug based on whether user has their own API key.
 		//
 		// Some models are only available via OpenRouter; for those, slugOpenAI may be empty.
 		// In that case, keep using the OpenRouter slug to avoid returning an empty model slug.
-		slug := config.slugOpenRouter
-		if hasOwnAPIKey && strings.TrimSpace(config.slugOpenAI) != "" {
-			slug = config.slugOpenAI
-		}
-
-		// 	model := &chatv2.SupportedModel{
-		// 		Name:         config.name,
-		// 		Slug:         slug,
-		// 		TotalContext: config.totalContext,
-		// 		MaxOutput:    config.maxOutput,
-		// 		InputPrice:   config.inputPrice,
-		// 		OutputPrice:  config.outputPrice,
-		// 	}
-
-		// 	// If model requires own key but user hasn't provided one, mark as disabled
-		// 	if config.requireOwnKey && !hasOwnAPIKey {
-		// 		model.Disabled = true
-		// 		model.DisabledReason = stringPtr("Requires your own OpenAI API key. Configure it in Settings.")
-		// 	}
+		// slug := config.slugOpenRouter
+		// if hasOwnAPIKey && strings.TrimSpace(config.slugOpenAI) != "" {
+		// 	slug = config.slugOpenAI
+		// }
 
-		// 	models = append(models, model)
+		model := &chatv2.SupportedModel{
+			Name:         config.name,
+			Slug:         config.slugOpenRouter,
+			TotalContext: config.totalContext,
+			MaxOutput:    config.maxOutput,
+			InputPrice:   config.inputPrice,
+			OutputPrice:  config.outputPrice,
+		}
 
-		// 	models = []*chatv2.SupportedModel{
-		// 	{
-		// 		Name:          "GPT-4.1",
-		// 		Slug:          "openai/gpt-4.1",
-		// 		TotalContext:  1050000,
-		// 		MaxOutput:     32800,
-		// 		InputPrice:    200,
-		// 		OutputPrice:   800,
-		// 		CustomModelId: "",
-		// 	},
-		// 	{
-		// 		Name:          "GPT-4.1-mini",
-		// 		Slug:          "openai/gpt-4.1-mini",
-		// 		TotalContext:  128000,
-		// 		MaxOutput:     16400,
-		// 		InputPrice:    15,
-		// 		OutputPrice:   60,
-		// 		CustomModelId: "",
-		// 	},
-		// 	{
-		// 		Name:          "Qwen Plus (balanced)",
-		// 		Slug:          "qwen/qwen-plus",
-		// 		TotalContext:  131100,
-		// 		MaxOutput:     8200,
-		// 		InputPrice:    40,
-		// 		OutputPrice:   120,
-		// 		CustomModelId: "",
-		// 	},
-		// 	{
-		// 		Name:          "Qwen Turbo (fast)",
-		// 		Slug:          "qwen/qwen-turbo",
-		// 		TotalContext:  1000000,
-		// 		MaxOutput:     8200,
-		// 		InputPrice:    5,
-		// 		OutputPrice:   20,
-		// 		CustomModelId: "",
-		// 	},
-		// 	{
-		// 		Name:          "Gemini 2.5 Flash (fast)",
-		// 		Slug:          "google/gemini-2.5-flash",
-		// 		TotalContext:  1050000,
-		// 		MaxOutput:     65500,
-		// 		InputPrice:    30,
-		// 		OutputPrice:   250,
-		// 		CustomModelId: "",
-		// 	},
-		// 	{
-		// 		Name:          "Gemini 3 Flash Preview",
-		// 		Slug:          "google/gemini-3-flash-preview",
-		// 		TotalContext:  1050000,
-		// 		MaxOutput:     65500,
-		// 		InputPrice:    50,
-		// 		OutputPrice:   300,
-		// 		CustomModelId: "",
-		// 	},
-		// }
+		// If model requires own key but user hasn't provided one, mark as disabled
+		if config.requireOwnKey {
+			model.Disabled = true
+			model.DisabledReason = stringPtr("Requires your own OpenAI API key. Configure it in Settings.")
+		}
 
-		// for _, m := range settings.CustomModels {
-		// 	models = slices.Insert(models, 0, &chatv2.SupportedModel{
-		// 		Name:          m.Name,
-		// 		Slug:          m.Slug,
-		// 		TotalContext:  int64(m.ContextWindow),
-		// 		MaxOutput:     int64(m.MaxOutput),
-		// 		InputPrice:    int64(m.InputPrice),
-		// 		OutputPrice:   int64(m.OutputPrice),
-		// 		CustomModelId: m.ID.Hex(),
-		// 	})
+		models = append(models, model)
 	}
-
 	return &chatv2.ListSupportedModelsResponse{
 		Models: models,
 	}, nil