Merge pull request #28 from adinhodovic/better-project-truncate

fix: Improve project truncation

Author: adinhodovic

internal/ui/details.go

@@ -12,6 +12,8 @@ import (
 	uiutil "github.com/adinhodovic/ai-dash/internal/ui/util"
 )
 
+const relatedProjectW = 12
+
 func detailPaneSectionHeights(termHeight int) (summary, detail, related int) {
 	bodyH := uilayout.PaneBodyHeight(uilayout.BottomPaneHeight(termHeight))
 	// Layout: summaryLabel(1) + summaryText(1) + divider(1) + detailTable + divider(1) + relatedLabel(1) + relatedTable
@@ -55,7 +57,7 @@ func (m *Model) resizeRelatedTable(filtered []session.Session) {
 	_, _, relatedH := detailPaneSectionHeights(m.height)
 	m.relatedTable.SetColumns([]table.Column{
 		{Title: "Tool", Width: 7},
-		{Title: "Project", Width: 12},
+		{Title: "Project", Width: relatedProjectW},
 		{Title: "Relation", Width: 8},
 		{Title: "Summary", Width: max(8, width-35)},
 	})
@@ -84,7 +86,7 @@ func (m *Model) syncRelatedTable(filtered []session.Session) {
 			rows,
 			table.Row{
 				candidate.Tool,
-				uiutil.CleanProjectName(candidate.Project),
+				uiutil.TruncateProject(candidate.Project, relatedProjectW),
 				relation,
 				candidate.Summary,
 			},

internal/ui/overview.go

@@ -46,7 +46,7 @@ func (m *Model) resizeOverviewTable(filtered []session.Session) {
 		}
 		rows = append(rows, table.Row{
 			uiutil.TimeAgo(ps.last),
-			uiutil.Truncate(uiutil.CleanProjectName(k), nameW),
+			uiutil.TruncateProject(k, nameW),
 			countStr,
 		})
 		m.projectPaths = append(m.projectPaths, k)

internal/ui/sessions.go

@@ -16,13 +16,13 @@ func (m *Model) resizeTable(filtered []session.Session) {
 	}
 	// Subtract pane border (2) for inner width; header join (1) for height.
 	tableW := max(40, width-2)
-	summaryW := max(16, tableW-63)
+	projectW, summaryW := sessionColumnWidths(tableW)
 	height := max(2, uilayout.PaneBodyHeight(uilayout.BottomPaneHeight(m.height))-1)
 	m.sessionTable.SetColumns([]table.Column{
 		{Title: m.sortHeader("Last Active", session.SortUpdated), Width: 14},
 		{Title: m.sortHeader("Tool", session.SortTool), Width: 8},
 		{Title: m.sortHeader("Status", session.SortStatus), Width: 11},
-		{Title: m.sortHeader("Project", session.SortProject), Width: 20},
+		{Title: m.sortHeader("Project", session.SortProject), Width: projectW},
 		{Title: m.sortHeader("Summary", session.SortSummary), Width: summaryW},
 	})
 	m.sessionTable.SetWidth(tableW)
@@ -32,20 +32,31 @@ func (m *Model) resizeTable(filtered []session.Session) {
 
 func (m *Model) syncTable(filtered []session.Session) {
 	rows := make([]table.Row, 0, len(filtered))
-	summaryWidth := max(16, m.sessionTable.Width()-63)
+	projectW, summaryW := sessionColumnWidths(m.sessionTable.Width())
 	for _, s := range filtered {
 		status := uiutil.SessionStatusLabel(s)
 		rows = append(rows, table.Row{
 			uiutil.TimeAgo(uiutil.LastActive(s)),
 			uiutil.Capitalize(s.Tool),
 			theme.StatusStyle(status).Render(uiutil.TruncateForCell(status, 11)),
-			uiutil.TruncateForCell(uiutil.CleanProjectName(s.Project), 20),
-			uiutil.TruncateForCell(uiutil.CleanSummary(s.Summary), summaryWidth),
+			uiutil.TruncateProject(s.Project, projectW),
+			uiutil.TruncateForCell(uiutil.CleanSummary(s.Summary), summaryW),
 		})
 	}
 	m.sessionTable.SetRows(rows)
 }
 
+func sessionColumnWidths(tableW int) (int, int) {
+	const fixed = 14 + 8 + 11
+	const cellPad = 5 * 2
+	const minSummaryW = 16
+	available := max(36, tableW-fixed-cellPad)
+	projectW := min(36, max(24, available/3))
+	projectW = min(projectW, available-minSummaryW)
+	summaryW := max(minSummaryW, available-projectW)
+	return projectW, summaryW
+}
+
 func (m *Model) resizeSourceTable() {
 	width := max(40, m.width*70/100-6)
 	m.sourceTable.SetColumns([]table.Column{

internal/ui/util/util.go

@@ -43,6 +43,57 @@ func TruncateForCell(value string, width int) string {
 	return Truncate(value, width)
 }
 
+func TruncateProject(value string, width int) string {
+	value = CleanProjectName(value)
+	if width <= 0 || lo.RuneLength(value) <= width {
+		return value
+	}
+	if !strings.Contains(value, "/") {
+		return Truncate(value, width)
+	}
+	return truncatePathTail(value, width)
+}
+
+func truncatePathTail(value string, width int) string {
+	const marker = ".../"
+
+	prefix := pathPrefix(value)
+	budget := width - lo.RuneLength(prefix) - lo.RuneLength(marker)
+	if budget < 4 {
+		return truncateMiddle(value, width)
+	}
+
+	return prefix + marker + lo.Substring(value, -budget, uint(budget))
+}
+
+func pathPrefix(value string) string {
+	if strings.HasPrefix(value, "~/") {
+		return "~/"
+	}
+	if strings.HasPrefix(value, "/") {
+		return "/"
+	}
+	idx := strings.Index(value, "/")
+	if idx >= 0 {
+		return value[:idx+1]
+	}
+	return ""
+}
+
+func truncateMiddle(value string, width int) string {
+	runes := []rune(value)
+	if width <= 0 || len(runes) <= width {
+		return value
+	}
+	if width <= 1 {
+		return string(runes[:width])
+	}
+	keep := width - 1
+	left := keep / 2
+	right := keep - left
+	return string(runes[:left]) + "~" + string(runes[len(runes)-right:])
+}
+
 var homeDir, _ = os.UserHomeDir()
 
 func ShortenPath(value string) string {

internal/ui/util/util_test.go

@@ -37,6 +37,26 @@ func TestTruncateForCell(t *testing.T) {
 	}
 }
 
+func TestTruncateProjectPreservesPathTail(t *testing.T) {
+	tests := []struct {
+		value string
+		width int
+		want  string
+	}{
+		{"~/oss/very-long-project-name", 18, "~/.../project-name"},
+		{"/var/tmp/very-long-project-name", 16, "/.../roject-name"},
+		{"team/very-long-project-name", 18, "team/.../ject-name"},
+		{"very-long-project-name", 10, "very-long~"},
+		{"short", 10, "short"},
+	}
+	for _, tt := range tests {
+		got := TruncateProject(tt.value, tt.width)
+		if got != tt.want {
+			t.Errorf("TruncateProject(%q, %d) = %q, want %q", tt.value, tt.width, got, tt.want)
+		}
+	}
+}
+
 func TestCleanProjectName(t *testing.T) {
 	home := homeDir
 	tests := []struct {