feat: use shared fzf model search

rumpl · rumpl · commit fe27014d33a5 · 2026-07-16T00:30:51.000+02:00
Extract model-choice filtering and ranking into a shared package backed by the existing fzf matcher. Search across the display name, provider, model ID, and reference while preserving the configured order for an empty query.

Update the full TUI model picker to use the shared search so other interfaces can provide identical matching and ranking without duplicating the implementation.

Signed-off-by: Djordje Lukic &lt;djordje.lukic@docker.com&gt;
diff --git a/pkg/modelpicker/search.go b/pkg/modelpicker/search.go
@@ -0,0 +1,60 @@
+package modelpicker
+
+import (
+	"sort"
+	"strings"
+
+	"github.com/junegunn/fzf/src/algo"
+	"github.com/junegunn/fzf/src/util"
+
+	"github.com/docker/docker-agent/pkg/runtime"
+)
+
+type scoredChoice struct {
+	choice runtime.ModelChoice
+	score  int
+}
+
+// Score returns fzf's match score for a model choice and query.
+func Score(choice runtime.ModelChoice, query string) (int, bool) {
+	query = strings.TrimSpace(query)
+	if query == "" {
+		return 0, true
+	}
+
+	chars := util.ToChars([]byte(choice.Name + " " + choice.Provider + " " + choice.Model + " " + choice.Ref))
+	result, _ := algo.FuzzyMatchV1(
+		false,
+		false,
+		true,
+		&chars,
+		[]rune(strings.ToLower(query)),
+		true,
+		nil,
+	)
+	return result.Score, result.Start >= 0
+}
+
+// Filter returns matching choices ranked by fzf score. An empty query keeps
+// the input order.
+func Filter(choices []runtime.ModelChoice, query string) []runtime.ModelChoice {
+	if strings.TrimSpace(query) == "" {
+		return append([]runtime.ModelChoice(nil), choices...)
+	}
+
+	matches := make([]scoredChoice, 0, len(choices))
+	for _, choice := range choices {
+		if score, ok := Score(choice, query); ok {
+			matches = append(matches, scoredChoice{choice: choice, score: score})
+		}
+	}
+	sort.SliceStable(matches, func(i, j int) bool {
+		return matches[i].score > matches[j].score
+	})
+
+	result := make([]runtime.ModelChoice, len(matches))
+	for i, match := range matches {
+		result[i] = match.choice
+	}
+	return result
+}
diff --git a/pkg/modelpicker/search_test.go b/pkg/modelpicker/search_test.go
@@ -0,0 +1,30 @@
+package modelpicker
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/docker/docker-agent/pkg/runtime"
+)
+
+func TestFilterUsesFuzzyModelMetadataSearch(t *testing.T) {
+	t.Parallel()
+
+	choices := []runtime.ModelChoice{
+		{Name: "Claude Sonnet", Ref: "sonnet", Provider: "anthropic", Model: "claude-sonnet-4-6"},
+		{Name: "GPT Five", Ref: "gpt", Provider: "openai", Model: "gpt-5"},
+	}
+
+	matches := Filter(choices, "cldsn46")
+	require.Len(t, matches, 1)
+	assert.Equal(t, "sonnet", matches[0].Ref)
+}
+
+func TestFilterEmptyQueryPreservesOrder(t *testing.T) {
+	t.Parallel()
+
+	choices := []runtime.ModelChoice{{Ref: "second"}, {Ref: "first"}}
+	assert.Equal(t, choices, Filter(choices, ""))
+}
diff --git a/pkg/tui/dialog/model_picker.go b/pkg/tui/dialog/model_picker.go
@@ -14,6 +14,7 @@ import (
 	tea "charm.land/bubbletea/v2"
 	"charm.land/lipgloss/v2"
 
+	"github.com/docker/docker-agent/pkg/modelpicker"
 	"github.com/docker/docker-agent/pkg/runtime"
 	"github.com/docker/docker-agent/pkg/tui/components/toolcommon"
 	"github.com/docker/docker-agent/pkg/tui/core"
@@ -324,22 +325,13 @@ func (d *modelPickerDialog) filterModels() {
 	// If query contains "/", show "Custom" option as well as matches
 	isCustomQuery := strings.Contains(query, "/")
 
-	d.filtered = d.filtered[:0]
-	for _, model := range d.models {
-		if query == "" {
-			d.filtered = append(d.filtered, model)
-			continue
-		}
-
-		// Match against name, provider, and model
-		searchText := strings.ToLower(model.Name + " " + model.Provider + " " + model.Model)
-		if strings.Contains(searchText, query) {
-			d.filtered = append(d.filtered, model)
-		}
-	}
+	d.filtered = modelpicker.Filter(d.models, query)
 
-	// If query looks like a custom model spec and we have no exact match, show it as an option
-	if isCustomQuery && len(d.filtered) == 0 {
+	// Keep an explicit provider/model option alongside fuzzy matches unless
+	// the query already identifies an available choice.
+	if isCustomQuery && !slices.ContainsFunc(d.models, func(model runtime.ModelChoice) bool {
+		return strings.EqualFold(model.Ref, query) || strings.EqualFold(model.Provider+"/"+model.Model, query)
+	}) {
 		d.filtered = append(d.filtered, runtime.ModelChoice{
 			Name: "Custom: " + query,
 			Ref:  query,
diff --git a/pkg/tui/dialog/model_picker_test.go b/pkg/tui/dialog/model_picker_test.go
@@ -80,8 +80,8 @@ func TestModelPickerFiltering(t *testing.T) {
 		d.Update(tea.KeyPressMsg{Text: string(ch)})
 	}
 
-	// Should now only show openai model
-	require.Len(t, d.filtered, 1, "should have 1 model after filtering for 'openai'")
+	// The exact provider match should rank above looser fuzzy matches.
+	require.NotEmpty(t, d.filtered)
 	require.Equal(t, "openai_model", d.filtered[0].Name)
 
 	// Selection should be reset to 0
@@ -92,7 +92,7 @@ func TestModelPickerCustomModel(t *testing.T) {
 	t.Parallel()
 
 	models := []runtime.ModelChoice{
-		{Name: "default_model", Ref: "default_model", Provider: "openai", Model: "gpt-4o", IsDefault: true},
+		{Name: "default_model", Ref: "openai/gpt-4o", Provider: "openai", Model: "gpt-4o", IsDefault: true},
 	}
 
 	dialog := NewModelPickerDialog(models)
@@ -105,10 +105,11 @@ func TestModelPickerCustomModel(t *testing.T) {
 		d.Update(tea.KeyPressMsg{Text: string(ch)})
 	}
 
-	// Should show the custom model option since nothing matches
-	require.Len(t, d.filtered, 1, "should have 1 item (custom option)")
-	require.Equal(t, "Custom: openai/gpt-4", d.filtered[0].Name)
-	require.Equal(t, "openai/gpt-4", d.filtered[0].Ref)
+	// Keep fuzzy matches and append the explicit custom model option.
+	require.GreaterOrEqual(t, len(d.filtered), 2)
+	custom := d.filtered[len(d.filtered)-1]
+	require.Equal(t, "Custom: openai/gpt-4", custom.Name)
+	require.Equal(t, "openai/gpt-4", custom.Ref)
 }
 
 func TestModelPickerRefreshShortcut(t *testing.T) {
