feat(cli): right-align the provider column in the model picker

Picker items get a detail field that renders flush right with a
two-space minimum gap; the label truncates to make room.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: jmelahman

cli/internal/tui/app.go

@@ -611,15 +611,13 @@ func (m Model) handleModelsLoaded(msg ModelsLoadedMsg) (tea.Model, tea.Cmd) {
 	var items []pickerItem
 	for i, opt := range m.llmModels {
 		label := opt.label
-		if opt.providerLabel != "" {
-			label += " - " + opt.providerLabel
-		}
 		if m.isCurrentModel(opt) {
 			label += " *"
 		}
 		items = append(items, pickerItem{
-			id:    strconv.Itoa(i),
-			label: label,
+			id:     strconv.Itoa(i),
+			label:  label,
+			detail: opt.providerLabel,
 		})
 	}
 	m.viewport.showPicker(pickerModel, items)

cli/internal/tui/commands_test.go

@@ -146,8 +146,8 @@ func TestSelectModelSetsOverrideAndStatus(t *testing.T) {
 func TestPickerBorderLinesShareOneWidth(t *testing.T) {
 	v := newViewport(120, false)
 	v.showPicker(pickerModel, []pickerItem{
-		{id: "0", label: "Gemma 4 E2B - Ollama *"},
-		{id: "1", label: "Qwen 3 8B - Ollama"},
+		{id: "0", label: "Gemma 4 E2B *", detail: "Ollama"},
+		{id: "1", label: "Qwen 3 8B", detail: "Ollama"},
 	})
 
 	var widths []int
@@ -168,6 +168,33 @@ func TestPickerBorderLinesShareOneWidth(t *testing.T) {
 	}
 }
 
+func TestFormatPickerLabelAlignsDetail(t *testing.T) {
+	rows := []pickerItem{
+		{label: "Gemma 4 E2B *", detail: "Ollama"},
+		{label: "Qwen 3 8B", detail: "Ollama"},
+		{label: "GPT-4o", detail: "OpenAI"},
+	}
+	const avail = 40
+	for _, row := range rows {
+		got := formatPickerLabel(row, avail)
+		if len([]rune(got)) != avail {
+			t.Errorf("%q: width = %d, want %d", got, len([]rune(got)), avail)
+		}
+		if !strings.HasSuffix(got, row.detail) {
+			t.Errorf("%q: detail %q must be flush right", got, row.detail)
+		}
+	}
+
+	long := pickerItem{label: strings.Repeat("x", 60), detail: "Ollama"}
+	got := formatPickerLabel(long, avail)
+	if len([]rune(got)) != avail {
+		t.Errorf("long label: width = %d, want %d", len([]rune(got)), avail)
+	}
+	if !strings.Contains(got, "...") || !strings.HasSuffix(got, "Ollama") {
+		t.Errorf("long label must truncate and keep detail flush right, got %q", got)
+	}
+}
+
 func TestSelectModelInvalidIndex(t *testing.T) {
 	m := NewModel(config.DefaultConfig(), nil)
 	m, _ = cmdSelectModel(m, "5")

cli/internal/tui/viewport.go

@@ -38,10 +38,12 @@ const (
 	pickerModel
 )
 
-// pickerItem is a selectable item in the picker.
+// pickerItem is a selectable item in the picker. detail, when set, is
+// right-aligned on the row (like a tabwriter column).
 type pickerItem struct {
-	id    string
-	label string
+	id     string
+	label  string
+	detail string
 }
 
 // streamRenderInterval is the minimum time between markdown re-renders during streaming.
@@ -324,11 +326,7 @@ func (v *viewport) renderPicker(width, height int) string {
 	var itemLines []string
 	for i := startIdx; i < endIdx; i++ {
 		item := v.pickerItems[i]
-		label := item.label
-		labelRunes := []rune(label)
-		if len(labelRunes) > innerWidth-4 {
-			label = string(labelRunes[:innerWidth-7]) + "..."
-		}
+		label := formatPickerLabel(item, innerWidth-4)
 		if i == v.pickerIndex {
 			line := lipgloss.NewStyle().Foreground(accentColor).Bold(true).Render("> " + label)
 			itemLines = append(itemLines, line)
@@ -376,6 +374,31 @@ func (v *viewport) renderPicker(width, height int) string {
 	return lipgloss.Place(width, height, lipgloss.Center, lipgloss.Center, panel)
 }
 
+// formatPickerLabel fits an item into avail columns. When the item has a
+// detail, the detail is right-aligned with at least a two-space gap and the
+// label is truncated to make room.
+func formatPickerLabel(item pickerItem, avail int) string {
+	label := []rune(item.label)
+	if item.detail == "" {
+		if len(label) > avail {
+			return string(label[:avail-3]) + "..."
+		}
+		return string(label)
+	}
+
+	detail := []rune(item.detail)
+	maxLabel := avail - len(detail) - 2
+	if maxLabel < 8 {
+		// Too narrow for columns — fall back to an inline suffix.
+		return formatPickerLabel(pickerItem{label: item.label + "  " + item.detail}, avail)
+	}
+	if len(label) > maxLabel {
+		label = []rune(string(label[:maxLabel-3]) + "...")
+	}
+	gap := avail - len(label) - len(detail)
+	return string(label) + strings.Repeat(" ", gap) + string(detail)
+}
+
 // streamingContent returns the display content for the in-progress stream.
 func (v *viewport) streamingContent() string {
 	if v.streamMarkdown && v.streamRendered != "" {