tui styling updates

Author: skarim

internal/tui/modifyview/model.go

@@ -113,8 +113,9 @@ type Model struct {
 	actionStack []StagedAction
 
 	// Rename mode
-	renameMode  bool
-	renameInput textinput.Model
+	renameMode     bool
+	renameInput    textinput.Model
+	renameOriginal string // original branch name shown as label
 
 	// Help overlay
 	showHelp bool
@@ -701,7 +702,9 @@ func (m *Model) startRename() {
 	}
 
 	m.renameMode = true
+	m.renameOriginal = node.Ref.Branch
 	m.renameInput.SetValue(node.Ref.Branch)
+	m.renameInput.Prompt = ""
 	m.renameInput.Focus()
 	m.renameInput.CursorEnd()
 }
@@ -830,7 +833,7 @@ func (m Model) nodeLineCount(idx int) int {
 }
 
 func (m Model) contentViewHeight() int {
-	reserved := 1 // status line
+	reserved := 3 // post-scroll newline + context line + status bar
 	if shared.ShouldShowHeader(m.width, m.height) {
 		reserved += shared.HeaderHeight
 	}
@@ -983,55 +986,51 @@ func (m Model) View() string {
 		shared.RenderHeader(&out, m.buildHeaderConfig(), m.width, m.height)
 	}
 
+	// Build the scrollable branch list content
 	var b strings.Builder
-
-	// Branch list — all nodes rendered with shared renderer, annotations for pending actions
 	for i := 0; i < len(m.nodes); i++ {
 		nodeData := toNodeData(m.nodes[i], i)
 		isFocused := i == m.cursor
 		annotation := nodeAnnotation(m.nodes[i], i)
 		shared.RenderNode(&b, nodeData, isFocused, m.width, annotation)
 	}
-
-	// Trunk
 	shared.RenderTrunk(&b, m.trunk.Branch)
 
-	// Rename input line (if in rename mode)
-	if m.renameMode {
-		b.WriteString("\n")
-		b.WriteString(renameBadge.Render("Rename: "))
-		b.WriteString(m.renameInput.View())
-		b.WriteString("\n")
-	}
-
-	// Transient status message
-	if m.statusMessage != "" {
-		b.WriteString("\n")
-		if m.statusIsError {
-			b.WriteString(transientErrorStyle.Render("✗ " + m.statusMessage))
-		} else {
-			b.WriteString(transientInfoStyle.Render(m.statusMessage))
-		}
-		b.WriteString("\n")
-	}
-
-	content := b.String()
+	// Count fixed bottom lines (always visible, not scrollable).
+	// The bottom section always has 2 lines: one for contextual info
+	// (rename prompt or error, blank when neither) and one for the status bar.
+	bottomLines := 2 // post-scroll newline + context line + status bar
 
-	// Scrolling
-	reservedLines := 0
+	// Scrolling — reserve space for header and fixed bottom
+	reservedLines := bottomLines
 	if showHeader {
-		reservedLines = shared.HeaderHeight
+		reservedLines += shared.HeaderHeight
 	}
-	viewHeight := m.height - reservedLines - 1 // -1 for status line
+	viewHeight := m.height - reservedLines
 	if viewHeight < 1 {
 		viewHeight = 1
 	}
 
-	out.WriteString(shared.ApplyScrollToContent(content, m.scrollOffset, viewHeight))
+	out.WriteString(shared.ApplyScrollToContent(b.String(), m.scrollOffset, viewHeight))
 	out.WriteString("\n")
 
-	// Status line at the bottom
-	out.WriteString(renderStatusLine(m.nodes, m.width))
+	// Second-to-bottom: error/status message line (always present, blank when empty)
+	if m.statusMessage != "" {
+		if m.statusIsError {
+			out.WriteString(transientErrorStyle.Render("✗ " + m.statusMessage))
+		} else {
+			out.WriteString(transientInfoStyle.Render(m.statusMessage))
+		}
+	}
+
+	// Bottom line: rename prompt (when active) or status bar
+	out.WriteString("\n")
+	if m.renameMode {
+		out.WriteString(renameBadge.Render(fmt.Sprintf("Rename: %s → ", m.renameOriginal)))
+		out.WriteString(m.renameInput.View())
+	} else {
+		out.WriteString(renderStatusLine(m.nodes, m.width))
+	}
 
 	return out.String()
 }
@@ -1079,12 +1078,12 @@ func (m Model) buildHeaderConfig() shared.HeaderConfig {
 		ShortcutColumns: 2,
 		Shortcuts: []shared.ShortcutEntry{
 			// Left column                          // Right column
-			{Key: "↑↓", Desc: "select branch"},     {Key: "x", Desc: "drop", Disabled: structureDisabled},
-			{Key: "f", Desc: "view files"},          {Key: "r", Desc: "rename", Disabled: structureDisabled},
-			{Key: "c", Desc: "view commits"},        {Key: "u", Desc: "fold up", Disabled: structureDisabled},
-			{Key: "?", Desc: "help"},                {Key: "d", Desc: "fold down", Disabled: structureDisabled},
-			{Key: "q/esc", Desc: "quit"},            {Key: "shift+↑↓", Desc: "reorder", Disabled: reorderDisabled},
-			{Key: "^S", Desc: "apply changes"},      {Key: "z", Desc: "undo"},
+			{Key: "↑↓", Desc: "select branch"}, {Key: "x", Desc: "drop", Disabled: structureDisabled},
+			{Key: "f", Desc: "view files"}, {Key: "r", Desc: "rename", Disabled: structureDisabled},
+			{Key: "c", Desc: "view commits"}, {Key: "u", Desc: "fold up", Disabled: structureDisabled},
+			{Key: "?", Desc: "help"}, {Key: "d", Desc: "fold down", Disabled: structureDisabled},
+			{Key: "q/esc", Desc: "quit"}, {Key: "shift+↑↓", Desc: "reorder", Disabled: reorderDisabled},
+			{Key: "^S", Desc: "apply changes"}, {Key: "z", Desc: "undo"},
 		},
 	}
 }

internal/tui/shared/header.go

@@ -70,15 +70,15 @@ func ShouldShowShortcuts(width int) bool {
 }
 
 // RenderHeader renders the full-width header box.
+// Progressive disclosure as width narrows: first hides the art, then the
+// info text, keeping keyboard shortcuts always visible.
 func RenderHeader(b *strings.Builder, cfg HeaderConfig, width, height int) {
 	if width < 2 {
 		return
 	}
 	innerWidth := width - 2
 
-	showShortcuts := ShouldShowShortcuts(width)
-
-	// Build shortcut lines (possibly multi-column)
+	// Always build shortcut lines
 	type shortcutLine struct {
 		text     string
 		visWidth int
@@ -92,7 +92,7 @@ func RenderHeader(b *strings.Builder, cfg HeaderConfig, width, height int) {
 		cols = 1
 	}
 
-	if showShortcuts && len(cfg.Shortcuts) > 0 {
+	if len(cfg.Shortcuts) > 0 {
 		if cols >= 2 {
 			// Two-column layout with aligned keys and descriptions.
 			// First pass: compute max visual key width per column.
@@ -167,27 +167,45 @@ func RenderHeader(b *strings.Builder, cfg HeaderConfig, width, height int) {
 		rightColWidth = maxShortcutWidth + 2
 	}
 
+	// Determine what fits: shortcuts always shown, art and info are progressive.
+	// Hide art first (below 88 cols), then info text, as width narrows.
+	showArt := cfg.ShowArt
+	showInfo := true
+
+	// Hide art when viewport is too narrow for art + info + shortcuts
+	if showArt && width < 88 {
+		showArt = false
+	}
+
+	// If info + shortcuts don't fit, hide info
+	infoMinWidth := 20 // rough minimum for title/info text
+	if innerWidth < rightColWidth+infoMinWidth+4 {
+		showInfo = false
+	}
+
 	// Map info lines to row indices
 	infoByRow := make(map[int]string)
-	infoByRow[2] = HeaderTitleStyle.Render(cfg.Title)
-	if cfg.Subtitle != "" {
-		infoByRow[3] = HeaderInfoLabelStyle.Render(cfg.Subtitle)
-	}
-	for i, info := range cfg.InfoLines {
-		row := 5 + i
-		if row > 9 {
-			break
+	if showInfo {
+		infoByRow[2] = HeaderTitleStyle.Render(cfg.Title)
+		if cfg.Subtitle != "" {
+			infoByRow[3] = HeaderInfoLabelStyle.Render(cfg.Subtitle)
 		}
-		iconStyle := HeaderInfoStyle
-		if info.IconStyle != nil {
-			iconStyle = *info.IconStyle
+		for i, info := range cfg.InfoLines {
+			row := 5 + i
+			if row > 9 {
+				break
+			}
+			iconStyle := HeaderInfoStyle
+			if info.IconStyle != nil {
+				iconStyle = *info.IconStyle
+			}
+			infoByRow[row] = iconStyle.Render(info.Icon) + HeaderInfoLabelStyle.Render(" "+info.Label)
 		}
-		infoByRow[row] = iconStyle.Render(info.Icon) + HeaderInfoLabelStyle.Render(" "+info.Label)
 	}
 
 	// Left content base width
 	leftContentBase := 1 // margin
-	if cfg.ShowArt {
+	if showArt {
 		leftContentBase += ArtDisplayWidth
 	}
 
@@ -207,7 +225,7 @@ func RenderHeader(b *strings.Builder, cfg HeaderConfig, width, height int) {
 	for i := 0; i < 10; i++ {
 		// Left column: art (optional) + info
 		artText := ""
-		if cfg.ShowArt {
+		if showArt {
 			artText = ArtLines[i]
 		}
 
@@ -220,7 +238,7 @@ func RenderHeader(b *strings.Builder, cfg HeaderConfig, width, height int) {
 
 		leftUsed := leftContentBase + infoVisualLen
 
-		if showShortcuts && len(shortcuts) > 0 {
+		if len(shortcuts) > 0 {
 			shortcutCol := innerWidth - rightColWidth
 			midPad := shortcutCol - leftUsed
 			if midPad < 0 {
@@ -241,7 +259,7 @@ func RenderHeader(b *strings.Builder, cfg HeaderConfig, width, height int) {
 
 			b.WriteString(HeaderBorderStyle.Render("│"))
 			b.WriteString(" ")
-			if cfg.ShowArt {
+			if showArt {
 				b.WriteString(artText)
 			}
 			b.WriteString(infoText)
@@ -257,7 +275,7 @@ func RenderHeader(b *strings.Builder, cfg HeaderConfig, width, height int) {
 
 			b.WriteString(HeaderBorderStyle.Render("│"))
 			b.WriteString(" ")
-			if cfg.ShowArt {
+			if showArt {
 				b.WriteString(artText)
 			}
 			b.WriteString(infoText)

internal/tui/stackview/model_test.go

@@ -221,18 +221,17 @@ func TestView_HeaderHiddenWhenNarrow(t *testing.T) {
 	assert.NotContains(t, view, "View Stack")
 }
 
-func TestView_HeaderWithoutShortcutsWhenMediumWidth(t *testing.T) {
+func TestView_HeaderShortcutsAlwaysVisible(t *testing.T) {
 	nodes := makeNodes("b1", "b2")
 	m := New(nodes, testTrunk, "0.0.1")
 
-	// Wide enough for header but not for shortcuts (between minWidthForHeader and minWidthForShortcuts)
+	// Even at medium width, shortcuts should still be visible
 	updated, _ := m.Update(tea.WindowSizeMsg{Width: 60, Height: 40})
 	m = updated.(Model)
 
 	view := m.View()
 	assert.Contains(t, view, "┌", "header should be shown")
-	assert.Contains(t, view, "View Stack", "info should be shown")
-	assert.NotContains(t, view, "checkout", "shortcuts should be hidden at this width")
+	assert.Contains(t, view, "checkout", "shortcuts should always be visible")
 }
 
 func TestView_HeaderShowsMergedCount(t *testing.T) {