unify and dedupe across view and modify tui

Author: skarim

cmd/modify.go

@@ -86,6 +86,7 @@ func runModify(cfg *config.Config) error {
 	p := tea.NewProgram(
 		model,
 		tea.WithAltScreen(),
+		tea.WithMouseAllMotion(),
 	)
 
 	finalModel, err := p.Run()

cmd/submit.go

@@ -382,12 +382,12 @@ func handlePendingModify(cfg *config.Config, client github.ClientOps, s *stack.S
 			if errors.As(err, &httpErr) && httpErr.StatusCode == 404 {
 				cfg.Printf("Previous stack already deleted on GitHub")
 			} else {
-				cfg.Warningf("Failed to delete previous stack: %v", err)
+				cfg.Warningf("Failed to delete existing stack: %v", err)
 				cfg.Printf("Run `%s` again to retry", cfg.ColorCyan("gh stack submit"))
 				return err
 			}
 		} else {
-			cfg.Successf("Cleared previous stack on GitHub")
+			cfg.Successf("Cleared existing stack on GitHub")
 		}
 		// Clear the old stack ID so syncStack creates a new one
 		s.ID = ""
@@ -403,7 +403,7 @@ func clearPendingModifyState(cfg *config.Config, gitDir string) {
 		return
 	}
 	modify.ClearState(gitDir)
-	cfg.Successf("Modify state cleared — stack recreated on GitHub")
+	cfg.Successf("Stack recreated on GitHub to match local state")
 }
 
 // syncStack creates or updates a stack on GitHub from the active PRs.

internal/tui/modifyview/model.go

@@ -211,6 +211,25 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			return m.updateRename(msg)
 		}
 		return m.updateNormal(msg)
+
+	case tea.MouseMsg:
+		switch msg.Action {
+		case tea.MouseActionPress:
+			if msg.Button == tea.MouseButtonLeft {
+				return m.handleMouseClick(msg.X, msg.Y)
+			}
+			if msg.Button == tea.MouseButtonWheelUp {
+				if m.scrollOffset > 0 {
+					m.scrollOffset--
+				}
+				return m, nil
+			}
+			if msg.Button == tea.MouseButtonWheelDown {
+				m.scrollOffset++
+				m.clampScroll()
+				return m, nil
+			}
+		}
 	}
 
 	return m, nil
@@ -803,12 +822,7 @@ func (m *Model) ensureVisible() {
 	endLine := startLine + m.nodeLineCount(m.cursor)
 
 	viewHeight := m.contentViewHeight()
-	if startLine < m.scrollOffset {
-		m.scrollOffset = startLine
-	}
-	if endLine > m.scrollOffset+viewHeight {
-		m.scrollOffset = endLine - viewHeight
-	}
+	m.scrollOffset = shared.EnsureVisible(startLine, endLine, m.scrollOffset, viewHeight)
 }
 
 func (m Model) nodeLineCount(idx int) int {
@@ -833,16 +847,38 @@ func (m *Model) clampScroll() {
 		total += m.nodeLineCount(i)
 	}
 	total++ // trunk line
-	maxScroll := total - m.contentViewHeight()
-	if maxScroll < 0 {
-		maxScroll = 0
+	m.scrollOffset = shared.ClampScroll(total, m.contentViewHeight(), m.scrollOffset)
+}
+
+// --- Mouse handling ---
+
+// handleMouseClick processes a mouse click at the given screen position.
+func (m Model) handleMouseClick(screenX, screenY int) (tea.Model, tea.Cmd) {
+	nodes := make([]shared.BranchNodeData, len(m.nodes))
+	for i, n := range m.nodes {
+		nodes[i] = toNodeData(n, i)
+	}
+
+	result := shared.HandleClick(screenX, screenY, nodes, m.width, m.height, m.scrollOffset, shared.ShouldShowHeader(m.width, m.height), false)
+	if result.NodeIndex < 0 {
+		return m, nil
+	}
+
+	m.cursor = result.NodeIndex
+
+	if result.OpenURL != "" {
+		shared.OpenBrowserInBackground(result.OpenURL)
 	}
-	if m.scrollOffset > maxScroll {
-		m.scrollOffset = maxScroll
+	if result.ToggleFiles {
+		m.nodes[result.NodeIndex].FilesExpanded = !m.nodes[result.NodeIndex].FilesExpanded
+		m.clampScroll()
 	}
-	if m.scrollOffset < 0 {
-		m.scrollOffset = 0
+	if result.ToggleCommits {
+		m.nodes[result.NodeIndex].CommitsExpanded = !m.nodes[result.NodeIndex].CommitsExpanded
+		m.clampScroll()
 	}
+
+	return m, nil
 }
 
 // --- View ---
@@ -980,7 +1016,6 @@ func (m Model) View() string {
 	}
 
 	content := b.String()
-	contentLines := strings.Split(content, "\n")
 
 	// Scrolling
 	reservedLines := 0
@@ -992,20 +1027,7 @@ func (m Model) View() string {
 		viewHeight = 1
 	}
 
-	maxScroll := len(contentLines) - viewHeight
-	if maxScroll < 0 {
-		maxScroll = 0
-	}
-	start := m.scrollOffset
-	if start > maxScroll {
-		start = maxScroll
-	}
-	end := start + viewHeight
-	if end > len(contentLines) {
-		end = len(contentLines)
-	}
-
-	out.WriteString(strings.Join(contentLines[start:end], "\n"))
+	out.WriteString(shared.ApplyScrollToContent(content, m.scrollOffset, viewHeight))
 	out.WriteString("\n")
 
 	// Status line at the bottom

internal/tui/shared/render.go

@@ -2,6 +2,8 @@ package shared
 
 import (
 	"fmt"
+	"os/exec"
+	"runtime"
 	"strings"
 	"time"
 
@@ -158,7 +160,7 @@ func RenderPRHeader(b *strings.Builder, node BranchNodeData, isFocused bool, con
 	default:
 		stateLabel = " OPEN"
 	}
-	b.WriteString(style.Underline(true).Render(prLabel) + style.Render(stateLabel))
+	b.WriteString(PRLinkStyle.Render(prLabel) + style.Render(stateLabel))
 
 	if annotation != nil {
 		b.WriteString("  ")
@@ -394,3 +396,134 @@ func TimeAgo(t time.Time) string {
 		return fmt.Sprintf("%d months ago", months)
 	}
 }
+
+// --- Mouse click helpers ---
+
+// ClickResult describes what happened when a node was clicked.
+type ClickResult struct {
+	NodeIndex    int  // which node was clicked (-1 if none)
+	ToggleFiles  bool // should toggle files expansion
+	ToggleCommits bool // should toggle commits expansion
+	OpenURL      string // URL to open in browser (empty if none)
+}
+
+// HandleClick maps a screen click to a node action.
+// nodes is the list of BranchNodeData in display order.
+// showHeader indicates whether the header is visible.
+// scrollOffset is the current scroll position.
+// hasSeparators controls whether merged/queued separator lines are accounted for.
+func HandleClick(screenX, screenY int, nodes []BranchNodeData, width, height, scrollOffset int, showHeader, hasSeparators bool) ClickResult {
+	yOffset := 0
+	if showHeader {
+		if screenY < HeaderHeight {
+			return ClickResult{NodeIndex: -1}
+		}
+		yOffset = HeaderHeight
+	}
+
+	contentLine := (screenY - yOffset) + scrollOffset
+
+	line := 0
+	prevWasMerged := false
+	prevWasQueued := false
+	for i := 0; i < len(nodes); i++ {
+		if hasSeparators {
+			isMerged := nodes[i].Ref.IsMerged()
+			isQueued := nodes[i].Ref.IsQueued()
+			if isMerged && !prevWasMerged && i > 0 {
+				line++
+			} else if isQueued && !prevWasQueued && !prevWasMerged && i > 0 {
+				line++
+			}
+			prevWasMerged = isMerged
+			prevWasQueued = isQueued
+		}
+
+		nodeStart := line
+		nodeLines := NodeLineCount(nodes[i])
+
+		if contentLine >= nodeStart && contentLine < nodeStart+nodeLines {
+			result := ClickResult{NodeIndex: i}
+
+			// Click on PR header line — check if clicking the PR number
+			if contentLine == nodeStart && nodes[i].PR != nil && nodes[i].PR.URL != "" {
+				prStartX, prEndX := PRLabelColumns(nodes[i])
+				if screenX >= prStartX && screenX < prEndX {
+					result.OpenURL = nodes[i].PR.URL
+				}
+			}
+
+			// Click on files toggle line
+			if len(nodes[i].FilesChanged) > 0 {
+				if contentLine == nodeStart+FilesToggleLineOffset(nodes[i]) {
+					result.ToggleFiles = true
+				}
+			}
+
+			// Click on commits toggle line
+			if len(nodes[i].Commits) > 0 {
+				if contentLine == nodeStart+CommitToggleLineOffset(nodes[i]) {
+					result.ToggleCommits = true
+				}
+			}
+
+			return result
+		}
+		line += nodeLines
+	}
+
+	return ClickResult{NodeIndex: -1}
+}
+
+// FilesToggleLineOffset returns the line offset from node start to the files toggle.
+func FilesToggleLineOffset(node BranchNodeData) int {
+	offset := 1 // after header
+	if node.PR != nil {
+		offset++
+	}
+	return offset
+}
+
+// CommitToggleLineOffset returns the line offset from node start to the commits toggle.
+func CommitToggleLineOffset(node BranchNodeData) int {
+	offset := 1
+	if node.PR != nil {
+		offset++
+	}
+	if len(node.FilesChanged) > 0 {
+		offset++
+		if node.FilesExpanded {
+			offset += len(node.FilesChanged)
+		}
+	}
+	return offset
+}
+
+// PRLabelColumns returns the start and end X columns of the PR number label.
+func PRLabelColumns(node BranchNodeData) (int, int) {
+	col := 2 // bullet + space
+	icon := StatusIcon(node)
+	if icon != "" {
+		col += 2
+	}
+	prLabel := fmt.Sprintf("#%d", node.PR.Number)
+	return col, col + len(prLabel)
+}
+
+// OpenBrowserInBackground launches the system browser for the given URL.
+func OpenBrowserInBackground(url string) {
+	cmd := BrowserCmd(url)
+	_ = cmd.Start()
+}
+
+// BrowserCmd returns an exec.Cmd to open a URL in the default browser.
+func BrowserCmd(url string) *exec.Cmd {
+	switch runtime.GOOS {
+	case "darwin":
+		return exec.Command("open", url)
+	case "windows":
+		return exec.Command("cmd", "/c", "start", url)
+	default:
+		return exec.Command("xdg-open", url)
+	}
+}

internal/tui/shared/scroll.go

@@ -1,5 +1,7 @@
 package shared
 
+import "strings"
+
 // ClampScroll ensures scrollOffset doesn't exceed content bounds.
 func ClampScroll(totalLines, viewHeight, scrollOffset int) int {
 	maxScroll := totalLines - viewHeight
@@ -28,3 +30,22 @@ func EnsureVisible(startLine, endLine, scrollOffset, viewHeight int) int {
 	}
 	return scrollOffset
 }
+
+// ApplyScrollToContent takes rendered content, splits into lines, applies
+// scroll offset, and returns the visible portion as a string.
+func ApplyScrollToContent(content string, scrollOffset, viewHeight int) string {
+	lines := strings.Split(content, "\n")
+	maxScroll := len(lines) - viewHeight
+	if maxScroll < 0 {
+		maxScroll = 0
+	}
+	start := scrollOffset
+	if start > maxScroll {
+		start = maxScroll
+	}
+	end := start + viewHeight
+	if end > len(lines) {
+		end = len(lines)
+	}
+	return strings.Join(lines[start:end], "\n")
+}

internal/tui/shared/styles.go

@@ -16,6 +16,7 @@ var (
 	QueuedIcon  = lipgloss.NewStyle().Foreground(lipgloss.Color("130")).Render("◎")
 
 	// PR status styles
+	PRLinkStyle   = lipgloss.NewStyle().Foreground(lipgloss.Color("15")).Underline(true)
 	PROpenStyle   = lipgloss.NewStyle().Foreground(lipgloss.Color("2"))
 	PRMergedStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("5"))
 	PRClosedStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("1"))