search by entire branch list

Author: skarim

internal/tui/checkoutview/data.go

@@ -66,6 +66,11 @@ type StackRow struct {
 	Created      time.Time
 	HasCreated   bool
 
+	// Branches is the full ordered list of branch names in the stack. Only
+	// BottomBranch and TopBranch are displayed; the complete list exists so
+	// search can match any branch, including mid-stack ones.
+	Branches []string
+
 	// LocalStack points at the local stack when Type == TypeLocal, so the caller
 	// can check out its branches directly without cloning. It is nil for
 	// remote-only rows, which are cloned by stack number instead.
@@ -185,6 +190,10 @@ func localRow(ls *stack.Stack, rs *github.RemoteStack) (StackRow, bool) {
 		row.BottomBranch = ls.Branches[0].Branch
 		row.TopBranch = ls.Branches[len(ls.Branches)-1].Branch
 	}
+	row.Branches = make([]string, len(ls.Branches))
+	for i := range ls.Branches {
+		row.Branches[i] = ls.Branches[i].Branch
+	}
 
 	if rs != nil {
 		if rs.Number != 0 {
@@ -219,6 +228,10 @@ func remoteRow(rs *github.RemoteStack) (StackRow, bool) {
 		BottomBranch: rs.PRDetails[0].Head.Ref,
 		TopBranch:    rs.PRDetails[len(rs.PRDetails)-1].Head.Ref,
 	}
+	row.Branches = make([]string, len(rs.PRDetails))
+	for i, p := range rs.PRDetails {
+		row.Branches[i] = p.Head.Ref
+	}
 	if t, ok := parseTime(rs.CreatedAt); ok {
 		row.Created, row.HasCreated = t, true
 	}

internal/tui/checkoutview/data_test.go

@@ -219,6 +219,31 @@ func TestBuildRows_ClosedNonMergedStackIsKept(t *testing.T) {
 	assert.Equal(t, StatusCounts{Closed: 2}, rows[0].Status)
 }
 
+func TestBuildRows_PopulatesAllBranchesForSearch(t *testing.T) {
+	local := []stack.Stack{{
+		Number: 3,
+		Trunk:  stack.BranchRef{Branch: "main"},
+		Branches: []stack.BranchRef{
+			{Branch: "a"}, {Branch: "b"}, {Branch: "c"},
+		},
+	}}
+	rows := BuildRows(local, nil)
+	require.Len(t, rows, 1)
+	assert.Equal(t, []string{"a", "b", "c"}, rows[0].Branches, "local rows carry every branch name for search")
+
+	remote := []github.RemoteStack{{
+		ID: 1, Number: 9, Base: github.RemoteStackBase{Ref: "main"},
+		PRDetails: []github.RemoteStackPR{
+			{Number: 1, State: "open", Head: github.RemoteStackPRHead{Ref: "r1"}},
+			{Number: 2, State: "open", Head: github.RemoteStackPRHead{Ref: "r2"}},
+			{Number: 3, State: "open", Head: github.RemoteStackPRHead{Ref: "r3"}},
+		},
+	}}
+	rrows := BuildRows(nil, remote)
+	require.Len(t, rrows, 1)
+	assert.Equal(t, []string{"r1", "r2", "r3"}, rrows[0].Branches, "remote rows carry every branch name for search")
+}
+
 func TestBuildRows_UntrackedLocalWithMergedPRFlag(t *testing.T) {
 	local := []stack.Stack{{
 		Number: 3,

internal/tui/checkoutview/model.go

@@ -214,9 +214,12 @@ func matchesQuery(r StackRow, q string) bool {
 	if q == "" {
 		return true
 	}
-	hay := strings.ToLower(strings.Join([]string{
-		r.NumberDisplay(), r.Summary(), r.Base, r.Type.String(),
-	}, " "))
+	// Search the stack number, base, type, and every branch name — including
+	// mid-stack branches that are not shown in the Branches column.
+	parts := make([]string, 0, len(r.Branches)+5)
+	parts = append(parts, r.NumberDisplay(), r.Base, r.Type.String(), r.BottomBranch, r.TopBranch)
+	parts = append(parts, r.Branches...)
+	hay := strings.ToLower(strings.Join(parts, " "))
 	return strings.Contains(hay, q)
 }
 

internal/tui/checkoutview/model_test.go

@@ -123,6 +123,25 @@ func TestSearchMatchesNumberAndType(t *testing.T) {
 	assert.Equal(t, TypeRemote, m.filtered[0].Type)
 }
 
+func TestSearchMatchesMidStackBranch(t *testing.T) {
+	rows := []StackRow{
+		{Number: 7, Type: TypeLocal, BottomBranch: "feat/bottom", TopBranch: "feat/top",
+			Branches: []string{"feat/bottom", "feat/middle-xyz", "feat/top"}, Base: "main"},
+		{Number: 8, Type: TypeRemote, BottomBranch: "other/a", TopBranch: "other/b",
+			Branches: []string{"other/a", "other/b"}, Base: "main"},
+	}
+	m := sized(New(rows))
+	m = drive(m, runeKey("/"))
+	for _, r := range "middle" {
+		m = drive(m, tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{r}})
+	}
+
+	require.Len(t, m.filtered, 1, "a mid-stack branch name should match")
+	assert.Equal(t, 7, m.filtered[0].Number)
+	// The matched mid-stack branch is not shown in the Branches column.
+	assert.NotContains(t, stripANSI(m.View()), "middle-xyz")
+}
+
 func TestCursorNavigationClamps(t *testing.T) {
 	m := sized(New(sampleRows()))
 	// Up at the top stays at 0.