Fixed progress UI to adapt to terminal width

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

Author: ndeloof

cmd/display/tty.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io"
 	"iter"
+	"slices"
 	"strings"
 	"sync"
 	"time"
@@ -258,13 +259,34 @@ func (w *ttyWriter) childrenTasks(parent string) iter.Seq[*task] {
 	}
 }
 
+// lineData holds pre-computed formatting for a task line
+type lineData struct {
+	spinner   string // rendered spinner with color
+	prefix    string // dry-run prefix if any
+	taskID    string // possibly abbreviated
+	progress  string // progress bar and size info
+	status    string // rendered status with color
+	details   string // possibly abbreviated
+	timer     string // rendered timer with color
+	statusPad int    // padding before status to align
+	timerPad  int    // padding before timer to align
+}
+
 func (w *ttyWriter) print() {
 	w.mtx.Lock()
 	defer w.mtx.Unlock()
 	if len(w.tasks) == 0 {
 		return
 	}
 	terminalWidth := goterm.Width()
+	terminalHeight := goterm.Height()
+	if terminalWidth <= 0 {
+		terminalWidth = 80
+	}
+	if terminalHeight <= 0 {
+		terminalHeight = 24
+	}
+
 	up := w.numLines + 1
 	if !w.repeated {
 		up--
@@ -283,48 +305,135 @@ func (w *ttyWriter) print() {
 	firstLine := fmt.Sprintf("[+] %s %d/%d", w.operation, numDone(w.tasks), len(w.tasks))
 	_, _ = fmt.Fprintln(w.out, firstLine)
 
-	var statusPadding int
-	for _, t := range w.tasks {
-		l := len(t.ID)
-		if len(t.parents) == 0 && statusPadding < l {
-			statusPadding = l
-		}
+	// Collect parent tasks in original order
+	allTasks := slices.Collect(w.parentTasks())
+
+	// Available lines: terminal height - 2 (header line + potential "more" line)
+	maxLines := terminalHeight - 2
+	if maxLines < 1 {
+		maxLines = 1
+	}
+
+	showMore := len(allTasks) > maxLines
+	tasksToShow := allTasks
+	if showMore {
+		tasksToShow = allTasks[:maxLines-1] // Reserve one line for "more" message
 	}
 
-	skipChildEvents := len(w.tasks) > goterm.Height()-2
+	// collect line data and compute timerLen
+	lines := make([]lineData, len(tasksToShow))
+	var timerLen int
+	for i, t := range tasksToShow {
+		lines[i] = w.prepareLineData(t)
+	}
+
+	// shorten details/taskID to fit terminal width
+	w.adjustLineWidth(lines, timerLen, terminalWidth)
+
+	// compute padding
+	w.applyPadding(lines, terminalWidth, timerLen)
+
+	// Render lines
 	numLines := 0
-	for t := range w.parentTasks() {
-		line := w.lineText(t, "", terminalWidth, statusPadding, w.dryRun)
-		_, _ = fmt.Fprint(w.out, line)
+	for _, l := range lines {
+		_, _ = fmt.Fprint(w.out, lineText(l))
 		numLines++
-		if skipChildEvents {
-			continue
-		}
-		for child := range w.childrenTasks(t.ID) {
-			line := w.lineText(child, "  ", terminalWidth, statusPadding-2, w.dryRun)
-			_, _ = fmt.Fprint(w.out, line)
-			numLines++
+	}
+
+	if showMore {
+		moreCount := len(allTasks) - len(tasksToShow)
+		moreText := fmt.Sprintf(" ... %d more", moreCount)
+		pad := terminalWidth - len(moreText)
+		if pad < 0 {
+			pad = 0
 		}
+		_, _ = fmt.Fprintf(w.out, "%s%s\n", moreText, strings.Repeat(" ", pad))
+		numLines++
 	}
+
+	// Clear any remaining lines from previous render
 	for i := numLines; i < w.numLines; i++ {
-		if numLines < goterm.Height()-2 {
-			_, _ = fmt.Fprintln(w.out, strings.Repeat(" ", terminalWidth))
-			numLines++
-		}
+		_, _ = fmt.Fprintln(w.out, strings.Repeat(" ", terminalWidth))
+		numLines++
 	}
 	w.numLines = numLines
 }
 
-func (w *ttyWriter) lineText(t *task, pad string, terminalWidth, statusPadding int, dryRun bool) string {
+func (w *ttyWriter) applyPadding(lines []lineData, terminalWidth int, timerLen int) {
+	var maxBeforeStatus int
+	for i := range lines {
+		l := &lines[i]
+		// Width before status: space(1) + spinner(1) + prefix + space(1) + taskID + [progress] + space(1)
+		beforeStatus := 4 + lenAnsi(l.prefix) + len(l.taskID) + lenAnsi(l.progress)
+		if beforeStatus > maxBeforeStatus {
+			maxBeforeStatus = beforeStatus
+		}
+	}
+
+	for i, l := range lines {
+		// Position before statusPad: space(1) + spinner(1) + prefix + space(1) + taskID + progress + space(1)
+		beforeStatus := 4 + lenAnsi(l.prefix) + len(l.taskID) + lenAnsi(l.progress)
+		// statusPad aligns status; lineText adds 1 more space after statusPad
+		l.statusPad = maxBeforeStatus - beforeStatus
+
+		// Format: space(1) + spinner(1) + prefix + space(1) + taskID + progress + statusPad + space(1) + status
+		lineLen := beforeStatus + l.statusPad + 1 + lenAnsi(l.status)
+		if l.details != "" {
+			lineLen += 1 + len(l.details)
+		}
+		l.timerPad = terminalWidth - lineLen - timerLen
+		if l.timerPad < 1 {
+			l.timerPad = 1
+		}
+		lines[i] = l
+
+	}
+}
+
+func (w *ttyWriter) adjustLineWidth(lines []lineData, timerLen int, terminalWidth int) {
+	for i := range lines {
+		l := &lines[i]
+		statusLen := lenAnsi(l.status)
+		detailsLen := len(l.details)
+		if detailsLen > 0 {
+			detailsLen++ // details is printed with an additional space if present
+		}
+		// line: space(1) + spinner(1) + prefix + space(1) + taskID + progress + space(1) + [padding] + status + [space(1) + details] + [padding] + timer
+		widthWithoutDetails := 5 + lenAnsi(l.prefix) + len(l.taskID) + lenAnsi(l.progress) + statusLen + timerLen
+		overflow := widthWithoutDetails + detailsLen - terminalWidth
+
+		if overflow > 0 {
+			// First, abbreviate details
+			if detailsLen > overflow+3 {
+				l.details = l.details[:detailsLen-overflow-3] + "..."
+			} else {
+				l.details = ""
+				// Then abbreviate task ID if still overflowing
+				overflow = widthWithoutDetails - terminalWidth
+				if overflow > 0 {
+					minIDLen := 10
+					if len(l.taskID) > minIDLen+overflow {
+						l.taskID = l.taskID[:len(l.taskID)-overflow-3] + "..."
+					} else if len(l.taskID) > minIDLen {
+						l.taskID = l.taskID[:minIDLen-3] + "..."
+					}
+				}
+			}
+		}
+	}
+}
+
+func (w *ttyWriter) prepareLineData(t *task) lineData {
 	endTime := time.Now()
 	if t.status != api.Working {
 		endTime = t.startTime
 		if (t.endTime != time.Time{}) {
 			endTime = t.endTime
 		}
 	}
+
 	prefix := ""
-	if dryRun {
+	if w.dryRun {
 		prefix = PrefixColor(DRYRUN_PREFIX)
 	}
 
@@ -338,11 +447,9 @@ func (w *ttyWriter) lineText(t *task, pad string, terminalWidth, statusPadding i
 	)
 
 	// only show the aggregated progress while the root operation is in-progress
-	if parent := t; parent.status == api.Working {
-		for child := range w.childrenTasks(parent.ID) {
+	if t.status == api.Working {
+		for child := range w.childrenTasks(t.ID) {
 			if child.status == api.Working && child.total == 0 {
-				// we don't have totals available for all the child events
-				// so don't show the total progress yet
 				hideDetails = true
 			}
 			total += child.total
@@ -356,49 +463,48 @@ func (w *ttyWriter) lineText(t *task, pad string, terminalWidth, statusPadding i
 		}
 	}
 
-	// don't try to show detailed progress if we don't have any idea
 	if total == 0 {
 		hideDetails = true
 	}
 
-	txt := t.ID
+	var progress string
 	if len(completion) > 0 {
-		var progress string
+		progress = " [" + SuccessColor(strings.Join(completion, "")) + "]"
 		if !hideDetails {
-			progress = fmt.Sprintf(" %7s / %-7s", units.HumanSize(float64(current)), units.HumanSize(float64(total)))
+			progress += fmt.Sprintf(" %7s / %-7s", units.HumanSize(float64(current)), units.HumanSize(float64(total)))
 		}
-		txt = fmt.Sprintf("%s [%s]%s",
-			t.ID,
-			SuccessColor(strings.Join(completion, "")),
-			progress,
-		)
-	}
-	textLen := len(txt)
-	padding := statusPadding - textLen
-	if padding < 0 {
-		padding = 0
-	}
-	// calculate the max length for the status text, on errors it
-	// is 2-3 lines long and breaks the line formatting
-	maxDetailsLen := terminalWidth - textLen - statusPadding - 15
-	details := t.details
-	// in some cases (debugging under VS Code), terminalWidth is set to zero by goterm.Width() ; ensuring we don't tweak strings with negative char index
-	if maxDetailsLen > 0 && len(details) > maxDetailsLen {
-		details = details[:maxDetailsLen] + "..."
-	}
-	text := fmt.Sprintf("%s %s%s %s %s%s %s",
-		pad,
-		spinner(t),
-		prefix,
-		txt,
-		strings.Repeat(" ", padding),
-		colorFn(t.status)(t.text),
-		details,
-	)
-	timer := fmt.Sprintf("%.1fs ", elapsed)
-	o := align(text, TimerColor(timer), terminalWidth)
+	}
 
-	return o
+	return lineData{
+		spinner:  spinner(t),
+		prefix:   prefix,
+		taskID:   t.ID,
+		progress: progress,
+		status:   colorFn(t.status)(t.text),
+		details:  t.details,
+		timer:    fmt.Sprintf("%.1fs", elapsed),
+	}
+}
+
+func lineText(l lineData) string {
+	var sb strings.Builder
+	sb.WriteString(" ")
+	sb.WriteString(l.spinner)
+	sb.WriteString(l.prefix)
+	sb.WriteString(" ")
+	sb.WriteString(l.taskID)
+	sb.WriteString(l.progress)
+	sb.WriteString(strings.Repeat(" ", l.statusPad))
+	sb.WriteString(" ")
+	sb.WriteString(l.status)
+	if l.details != "" {
+		sb.WriteString(" ")
+		sb.WriteString(l.details)
+	}
+	sb.WriteString(strings.Repeat(" ", l.timerPad))
+	sb.WriteString(TimerColor(l.timer))
+	sb.WriteString("\n")
+	return sb.String()
 }
 
 var (
@@ -443,17 +549,6 @@ func numDone(tasks map[string]*task) int {
 	return i
 }
 
-func align(l, r string, w int) string {
-	ll := lenAnsi(l)
-	lr := lenAnsi(r)
-	pad := ""
-	count := w - ll - lr
-	if count > 0 {
-		pad = strings.Repeat(" ", count)
-	}
-	return fmt.Sprintf("%s%s%s\n", l, pad, r)
-}
-
 // lenAnsi count of user-perceived characters in ANSI string.
 func lenAnsi(s string) int {
 	length := 0