Skip to content

Open source AI coding agent. Designed for large projects and real world tasks.

Improve model display strings and selection logic

Dane Schneidercfd421f4c305
diff --git a/app/cli/lib/model_settings.go b/app/cli/lib/model_settings.go
index 61b1b9d7..c1f7ff87 100644
--- a/app/cli/lib/model_settings.go
+++ b/app/cli/lib/model_settings.go
@@ -81,7 +81,7 @@ func SelectModelForRole(customModels []*shared.AvailableModel, role shared.Model
}
if p == provider {
- label := fmt.Sprintf("%s → %s | max %d 🪙", m.Provider, m.ModelName, m.MaxTokens)
+ label := fmt.Sprintf("%s | max %d 🪙", m.ModelString(), m.MaxTokens)
opts = append(opts, label)
selectableModels = append(selectableModels, m)
}
diff --git a/app/shared/ai_models_data_models.go b/app/shared/ai_models_data_models.go
index cc2effe7..c08d39c1 100644
--- a/app/shared/ai_models_data_models.go
+++ b/app/shared/ai_models_data_models.go
@@ -52,6 +52,15 @@ type AvailableModel struct {
UpdatedAt time.Time `json:"updatedAt"`
}
+func (m *AvailableModel) ModelString() string {
+ s := ""
+ if m.Provider != ModelProviderOpenAI {
+ s += string(m.Provider) + "/"
+ }
+ s += string(m.ModelId)
+ return s
+}
+
type PlannerModelConfig struct {
MaxConvoTokens int `json:"maxConvoTokens"`
}
@@ -224,7 +233,11 @@ func (p PlannerRoleConfig) GetRoleForTokens(tokens int) PlannerRoleConfig {
var currentConfig PlannerRoleConfig = p
var n int = 0
for {
- if currentConfig.BaseModelConfig.MaxTokens >= tokens {
+ effectiveMax := currentConfig.BaseModelConfig.MaxTokens
+ effectiveMax -= currentConfig.BaseModelConfig.ReservedOutputTokens
+ effectiveMax = int(float64(effectiveMax) * 0.9) // leave a little extra room
+
+ if effectiveMax >= tokens {
return currentConfig
}