disable selecting merged branches in TUIs

Author: skarim

internal/tui/modifyview/model.go

@@ -454,12 +454,16 @@ func (m *Model) currentMode() actionMode {
 	return modeNone
 }
 
-// moveCursor moves the cursor by delta to the next node.
+// moveCursor moves the cursor by delta, skipping merged branches.
 func (m *Model) moveCursor(delta int) {
 	next := m.cursor + delta
-	if next >= 0 && next < len(m.nodes) {
-		m.cursor = next
-		m.ensureVisible()
+	for next >= 0 && next < len(m.nodes) {
+		if !m.nodes[next].Ref.IsMerged() {
+			m.cursor = next
+			m.ensureVisible()
+			return
+		}
+		next += delta
 	}
 }
 
@@ -866,6 +870,11 @@ func (m Model) handleMouseClick(screenX, screenY int) (tea.Model, tea.Cmd) {
 		return m, nil
 	}
 
+	// Don't allow selecting merged branches.
+	if m.nodes[result.NodeIndex].Ref.IsMerged() {
+		return m, nil
+	}
+
 	m.cursor = result.NodeIndex
 
 	if result.OpenURL != "" {

internal/tui/modifyview/model_test.go

@@ -756,3 +756,21 @@ func TestUndoRename_DoesNotAffectOtherRenames(t *testing.T) {
 	require.NotNil(t, m.nodes[0].PendingAction, "first rename should still be intact")
 	assert.Equal(t, "a-renamed", m.nodes[0].PendingAction.NewName, "first rename new name should be unchanged")
 }
+
+func TestCursorNavigation_SkipsMergedBranches(t *testing.T) {
+	nodes := []ModifyBranchNode{
+		makeNode("a", true, 0),
+		makeMergedNode("merged", 1),
+		makeNode("c", false, 2),
+	}
+	m := New(nodes, testTrunk, "1.0.0")
+	require.Equal(t, 0, m.cursor, "cursor should start on first non-merged")
+
+	// Move down should skip merged and land on c
+	m = sendKey(t, m, runeKey('j'))
+	assert.Equal(t, 2, m.cursor, "down should skip merged branch")
+
+	// Move up should skip merged and land back on a
+	m = sendKey(t, m, runeKey('k'))
+	assert.Equal(t, 0, m.cursor, "up should skip merged branch")
+}

internal/tui/stackview/model.go

@@ -83,14 +83,24 @@ func New(nodes []BranchNode, trunk stack.BranchRef, version string) Model {
 	h := help.New()
 	h.ShowAll = true
 
-	// Cursor starts at the current branch, or top of stack
+	// Cursor starts at the current branch, or first non-merged branch
 	cursor := 0
+	found := false
 	for i, n := range nodes {
-		if n.IsCurrent {
+		if n.IsCurrent && !n.Ref.IsMerged() {
 			cursor = i
+			found = true
 			break
 		}
 	}
+	if !found {
+		for i, n := range nodes {
+			if !n.Ref.IsMerged() {
+				cursor = i
+				break
+			}
+		}
+	}
 
 	return Model{
 		nodes:   nodes,
@@ -124,17 +134,11 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			return m, tea.Quit
 
 		case key.Matches(msg, keys.Up):
-			if m.cursor > 0 {
-				m.cursor--
-				m.ensureVisible()
-			}
+			m.moveCursor(-1)
 			return m, nil
 
 		case key.Matches(msg, keys.Down):
-			if m.cursor < len(m.nodes)-1 {
-				m.cursor++
-				m.ensureVisible()
-			}
+			m.moveCursor(1)
 			return m, nil
 
 		case key.Matches(msg, keys.ToggleCommits):
@@ -165,7 +169,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case key.Matches(msg, keys.Checkout):
 			if m.cursor >= 0 && m.cursor < len(m.nodes) {
 				node := m.nodes[m.cursor]
-				if !node.IsCurrent {
+				if !node.IsCurrent && !node.Ref.IsMerged() {
 					m.checkoutBranch = node.Ref.Branch
 					return m, tea.Quit
 				}
@@ -226,6 +230,11 @@ func (m Model) handleMouseClick(screenX, screenY int) (tea.Model, tea.Cmd) {
 		return m, nil
 	}
 
+	// Don't allow selecting merged branches.
+	if m.nodes[result.NodeIndex].Ref.IsMerged() {
+		return m, nil
+	}
+
 	m.cursor = result.NodeIndex
 
 	if result.OpenURL != "" {
@@ -248,6 +257,19 @@ func (m Model) nodeLineCount(idx int) int {
 	return shared.NodeLineCount(toBranchNodeData(m.nodes[idx]))
 }
 
+// moveCursor moves the cursor by delta, skipping merged branches.
+func (m *Model) moveCursor(delta int) {
+	next := m.cursor + delta
+	for next >= 0 && next < len(m.nodes) {
+		if !m.nodes[next].Ref.IsMerged() {
+			m.cursor = next
+			m.ensureVisible()
+			return
+		}
+		next += delta
+	}
+}
+
 // ensureVisible adjusts scroll offset so the cursor is visible.
 func (m *Model) ensureVisible() {
 	if m.height == 0 {

internal/tui/stackview/model_test.go

@@ -341,3 +341,50 @@ func TestScrollClamp_CannotScrollPastContent(t *testing.T) {
 	view := m.View()
 	assert.Contains(t, view, "b1", "content should still be visible after excessive scrolling")
 }
+
+func TestUpdate_CursorSkipsMergedBranches(t *testing.T) {
+	nodes := makeNodes("b1", "b2", "b3")
+	nodes[1].Ref.PullRequest = &stack.PullRequestRef{Number: 2, Merged: true}
+	m := New(nodes, testTrunk, "0.0.1")
+	assert.Equal(t, 0, m.cursor, "cursor should start on first non-merged branch")
+
+	// Down should skip b2 (merged) and land on b3
+	updated, _ := m.Update(keyMsg("down"))
+	m = updated.(Model)
+	assert.Equal(t, 2, m.cursor, "down should skip merged b2 and land on b3")
+
+	// Up should skip b2 (merged) and land back on b1
+	updated, _ = m.Update(keyMsg("up"))
+	m = updated.(Model)
+	assert.Equal(t, 0, m.cursor, "up should skip merged b2 and land on b1")
+}
+
+func TestNew_CursorSkipsMergedBranch(t *testing.T) {
+	nodes := makeNodes("b1", "b2", "b3")
+	nodes[0].Ref.PullRequest = &stack.PullRequestRef{Number: 1, Merged: true}
+	m := New(nodes, testTrunk, "0.0.1")
+	assert.Equal(t, 1, m.cursor, "cursor should skip merged b1 and start on b2")
+}
+
+func TestNew_CursorSkipsMergedCurrentBranch(t *testing.T) {
+	nodes := makeNodes("b1", "b2", "b3")
+	nodes[0].IsCurrent = true
+	nodes[0].Ref.PullRequest = &stack.PullRequestRef{Number: 1, Merged: true}
+	m := New(nodes, testTrunk, "0.0.1")
+	assert.Equal(t, 1, m.cursor, "cursor should not start on merged current branch")
+}
+
+func TestUpdate_EnterOnMergedDoesNothing(t *testing.T) {
+	// All non-merged so we can navigate, but force cursor onto a merged node
+	// by having b1 active and b2 merged and b3 active.
+	nodes := makeNodes("b1", "b2")
+	nodes[0].Ref.PullRequest = &stack.PullRequestRef{Number: 1, Merged: true}
+	m := New(nodes, testTrunk, "0.0.1")
+	// Cursor is on b2 (first non-merged). Manually set to b1 to test guard.
+	m.cursor = 0
+
+	updated, cmd := m.Update(keyMsg("enter"))
+	m = updated.(Model)
+	assert.Equal(t, "", m.CheckoutBranch(), "enter on merged branch should not set checkout")
+	assert.Nil(t, cmd, "enter on merged branch should not quit")
+}