.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version-file: go.mod
+          go-version: stable
           
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v6

.gitignore

@@ -1,14 +0,0 @@
-# build artifacts
-/dist/
-/bin/
-/coverage/
-
-# Go test binaries and coverage
-*.test
-*.out
-
-# logs
-*.log
-
-# OS
-.DS_Store

.goreleaser.yaml

@@ -7,10 +7,6 @@ before:
 builds:
   - env:
       - CGO_ENABLED=0
-    flags:
-      - -trimpath
-    ldflags:
-      - -s -w -X main.version={{ .Version }}
     goos:
       - linux
       - windows

README.md

@@ -10,7 +10,7 @@
 </p>
 
 <p align="center">
-  <img src= "https://github.com/user-attachments/assets/3695cfd2-148c-463d-9630-547d152adde0" alt="difi_demo" />
+  <img src= "https://github.com/user-attachments/assets/2cecb580-fe35-47ae-886b-8315226d122b" alt="difi_demo" />
 </p>
 
 ## Why difi?
@@ -172,4 +172,3 @@ Contributions are especially welcome in:
 
 <p align="center"> Made with ❤️ by <a href="https://github.com/oug-t">oug-t</a> </p>
 
-

cmd/difi/main.go

@@ -16,17 +16,15 @@ var version = "dev"
 func main() {
 	showVersion := flag.Bool("version", false, "Show version")
 	plain := flag.Bool("plain", false, "Print a plain, non-interactive summary and exit")
-	flat := flag.Bool("flat", false, "Start in flat file list mode")
 
 	flag.Usage = func() {
-		w := os.Stderr
+		fmt.Fprintf(os.Stderr, "Usage: difi [flags] [target-branch]\n")
-		fmt.Fprintln(w, "Usage: difi [flags] [target-branch]")
+		fmt.Fprintf(os.Stderr, "\nFlags:\n")
-		fmt.Fprintln(w, "\nFlags:")
 		flag.PrintDefaults()
-		fmt.Fprintln(w, "\nExamples:")
+		fmt.Fprintf(os.Stderr, "\nExamples:\n")
-		fmt.Fprintln(w, "  difi             # Diff against default")
+		fmt.Fprintf(os.Stderr, "  difi              # Diff against main\n")
-		fmt.Fprintln(w, "  difi develop     # Diff against develop")
+		fmt.Fprintf(os.Stderr, "  difi develop      # Diff against develop\n")
-		fmt.Fprintln(w, "  difi HEAD~1      # Diff against last commit")
+		fmt.Fprintf(os.Stderr, "  difi HEAD~1       # Diff against last commit\n")
 	}
 
 	flag.Parse()
@@ -42,7 +40,6 @@ func main() {
 	}
 
 	if *plain {
-		// Uses --name-status for a concise, machine-readable summary suitable for CI
 		cmd := exec.Command("git", "diff", "--name-status", fmt.Sprintf("%s...HEAD", target))
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
@@ -53,7 +50,6 @@ func main() {
 	}
 
 	cfg := config.Load()
-	cfg.Flat = *flat
 
 	p := tea.NewProgram(ui.NewModel(cfg, target), tea.WithAltScreen())
 	if _, err := p.Run(); err != nil {

go.mod

@@ -6,13 +6,14 @@ require (
 	github.com/charmbracelet/bubbles v0.21.0
 	github.com/charmbracelet/bubbletea v1.3.10
 	github.com/charmbracelet/lipgloss v1.1.0
-	github.com/charmbracelet/x/ansi v0.10.1
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/atotto/clipboard v0.1.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
+	github.com/charmbracelet/x/ansi v0.10.1 // indirect
 	github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
 	github.com/charmbracelet/x/term v0.2.1 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect

go.sum

@@ -53,3 +53,7 @@ golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
 golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/config/config.go

@@ -1,8 +1,7 @@
 package config
 
 type Config struct {
-	UI   UIConfig
+	UI UIConfig
-	Flat bool
 }
 
 type UIConfig struct {

internal/tree/tree.go

@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	"github.com/charmbracelet/bubbles/list"
-	"github.com/charmbracelet/lipgloss"
 )
 
 // FileTree holds the state of the entire file graph.
@@ -33,7 +32,6 @@ type TreeItem struct {
 	Depth    int
 	Expanded bool
 	Icon     string
-	Flat     bool
 }
 
 // Implement list.Item interface
@@ -106,40 +104,6 @@ func (t *FileTree) Items() []list.Item {
 	return items
 }
 
-// FlatItems returns all leaf (file) nodes as a flat list with full paths.
-func (t *FileTree) FlatItems() []list.Item {
-	var items []list.Item
-	collectLeaves(t.Root, &items)
-	return items
-}
-
-// collectLeaves recursively collects all file (non-directory) nodes.
-func collectLeaves(node *Node, items *[]list.Item) {
-	children := make([]*Node, 0, len(node.Children))
-	for _, child := range node.Children {
-		children = append(children, child)
-	}
-
-	sort.Slice(children, func(i, j int) bool {
-		return strings.ToLower(children[i].FullPath) < strings.ToLower(children[j].FullPath)
-	})
-
-	for _, child := range children {
-		if child.IsDir {
-			collectLeaves(child, items)
-		} else {
-			*items = append(*items, TreeItem{
-				Name:     child.Name,
-				FullPath: child.FullPath,
-				IsDir:    false,
-				Depth:    0,
-				Icon:     getIcon(child.Name, false),
-				Flat:     true,
-			})
-		}
-	}
-}
-
 // flatten recursively builds the list, respecting expansion state.
 func flatten(node *Node, items *[]list.Item) {
 	// Collect children to sort
@@ -225,22 +189,3 @@ func getIcon(name string, isDir bool) string {
 		return ""
 	}
 }
-
-// ShortenPath truncates a path from the left to fit within maxWidth display columns.
-// "internal/tree/tree.go" → "…nal/tree/tree.go"
-func ShortenPath(path string, maxWidth int) string {
-	if lipgloss.Width(path) <= maxWidth {
-		return path
-	}
-	ellipsis := "…"
-	avail := maxWidth - lipgloss.Width(ellipsis)
-	if avail <= 0 {
-		return ellipsis
-	}
-	// Trim runes from the left until the remainder fits
-	runes := []rune(path)
-	for len(runes) > 0 && lipgloss.Width(string(runes)) > avail {
-		runes = runes[1:]
-	}
-	return ellipsis + string(runes)
-}

internal/ui/delegate.go

@@ -7,7 +7,6 @@ import (
 	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/charmbracelet/x/ansi"
 	"github.com/oug-t/difi/internal/tree"
 )
 
@@ -25,15 +24,7 @@ func (d TreeDelegate) Render(w io.Writer, m list.Model, index int, item list.Ite
 		return
 	}
 
-	var title string
+	title := i.Title()
-	if i.Flat {
-		iconWidth := lipgloss.Width(i.Icon) + 1 // icon + space
-		path := tree.ShortenPath(i.FullPath, m.Width()-2-iconWidth)
-		title = fmt.Sprintf("%s %s", i.Icon, path)
-	} else {
-		title = i.Title()
-	}
-	title = ansi.Truncate(title, m.Width()-2, "…")
 
 	if index == m.Index() {
 		style := lipgloss.NewStyle().

internal/ui/model.go

@@ -46,9 +46,6 @@ type Model struct {
 	statsAdded   int
 	statsDeleted int
 
-	currentFileAdded   int
-	currentFileDeleted int
-
 	diffContent string
 	diffLines   []string
 	diffCursor  int
@@ -56,10 +53,8 @@ type Model struct {
 	inputBuffer string
 	pendingZ    bool
 
-	focus      Focus
+	focus    Focus
-	showHelp   bool
+	showHelp bool
-	flatMode   bool
-	treeHidden bool
 
 	width, height int
 }
@@ -70,12 +65,7 @@ func NewModel(cfg config.Config, targetBranch string) Model {
 	files, _ := git.ListChangedFiles(targetBranch)
 
 	t := tree.New(files)
-	var items []list.Item
+	items := t.Items()
-	if cfg.Flat {
-		items = t.FlatItems()
-	} else {
-		items = t.Items()
-	}
 
 	delegate := TreeDelegate{Focused: true}
 	l := list.New(items, delegate, 0, 0)
@@ -97,7 +87,6 @@ func NewModel(cfg config.Config, targetBranch string) Model {
 		targetBranch:  targetBranch,
 		repoName:      git.GetRepoName(),
 		showHelp:      false,
-		flatMode:      cfg.Flat,
 		inputBuffer:   "",
 		pendingZ:      false,
 	}
@@ -203,9 +192,6 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 		switch msg.String() {
 		case "tab":
-			if m.treeHidden {
-				return m, nil
-			}
 			if m.focus == FocusTree {
 				if item, ok := m.fileList.SelectedItem().(tree.TreeItem); ok && item.IsDir {
 					return m, nil
@@ -228,14 +214,12 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.inputBuffer = ""
 
 		case "h", "[", "ctrl+h", "left":
-			if !m.treeHidden {
+			m.focus = FocusTree
-				m.focus = FocusTree
+			m.updateTreeFocus()
-				m.updateTreeFocus()
-			}
 			m.inputBuffer = ""
 
 		case "enter":
-			if m.focus == FocusTree && !m.flatMode {
+			if m.focus == FocusTree {
 				if i, ok := m.fileList.SelectedItem().(tree.TreeItem); ok && i.IsDir {
 					m.treeState.ToggleExpand(i.FullPath)
 					m.fileList.SetItems(m.treeState.Items())
@@ -268,49 +252,6 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				return m, openFugitive(m.selectedPath, line)
 			}
 
-		case "f":
-			m.flatMode = !m.flatMode
-			prevPath := m.selectedPath
-			if m.flatMode {
-				m.fileList.SetItems(m.treeState.FlatItems())
-			} else {
-				m.fileList.SetItems(m.treeState.Items())
-			}
-			// Restore selection to the same file if possible
-			restored := false
-			for idx, item := range m.fileList.Items() {
-				if ti, ok := item.(tree.TreeItem); ok && ti.FullPath == prevPath {
-					m.fileList.Select(idx)
-					restored = true
-					break
-				}
-			}
-			// In flat mode, auto-select the first file if nothing was restored
-			if m.flatMode && !restored {
-				if first, ok := m.fileList.Items()[0].(tree.TreeItem); ok {
-					m.fileList.Select(0)
-					m.selectedPath = first.FullPath
-					m.diffCursor = 0
-					m.diffViewport.GotoTop()
-					m.inputBuffer = ""
-					return m, git.DiffCmd(m.targetBranch, m.selectedPath)
-				}
-			}
-			m.inputBuffer = ""
-			return m, nil
-
-		case "t":
-			m.treeHidden = !m.treeHidden
-			if m.treeHidden {
-				m.focus = FocusDiff
-			} else {
-				m.focus = FocusTree
-			}
-			m.updateTreeFocus()
-			m.updateSizes()
-			m.inputBuffer = ""
-			return m, nil
-
 		case "z":
 			if m.focus == FocusDiff {
 				m.pendingZ = true
@@ -364,7 +305,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}
 			m.inputBuffer = ""
 
-		case "j", "down", "ctrl+n":
+		case "j", "down":
 			keyHandled = true
 			count := m.getRepeatCount()
 			for i := 0; i < count; i++ {
@@ -381,7 +322,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			}
 			m.inputBuffer = ""
 
-		case "k", "up", "ctrl+p":
+		case "k", "up":
 			keyHandled = true
 			count := m.getRepeatCount()
 			for i := 0; i < count; i++ {
@@ -421,41 +362,9 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	switch msg := msg.(type) {
 	case git.DiffMsg:
-		fullLines := strings.Split(msg.Content, "\n")
+		m.diffContent = msg.Content
-
+		m.diffLines = strings.Split(msg.Content, "\n")
-		var cleanLines []string
+		m.diffViewport.SetContent(msg.Content)
-		var added, deleted int
-		foundHunk := false
-
-		for _, line := range fullLines {
-			cleanLine := stripAnsi(line)
-
-			if strings.HasPrefix(cleanLine, "@@") {
-				foundHunk = true
-			}
-
-			if !foundHunk {
-				continue
-			}
-
-			cleanLines = append(cleanLines, line)
-
-			// Check "+++" to avoid counting file header
-			if strings.HasPrefix(cleanLine, "+") && !strings.HasPrefix(cleanLine, "+++") {
-				added++
-			} else if strings.HasPrefix(cleanLine, "-") && !strings.HasPrefix(cleanLine, "---") {
-				deleted++
-			}
-		}
-
-		m.diffLines = cleanLines
-		m.currentFileAdded = added
-		m.currentFileDeleted = deleted
-
-		newContent := strings.Join(cleanLines, "\n")
-		m.diffContent = newContent
-		m.diffViewport.SetContent(newContent)
-		m.diffViewport.GotoTop()
 
 	case git.EditorFinishedMsg:
 		return m, git.DiffCmd(m.targetBranch, m.selectedPath)
@@ -488,7 +397,7 @@ func (m *Model) updateSizes() {
 	// 1 line Top Bar + 1 line Bottom Bar = 2 reserved
 	reservedHeight := 2
 	if m.showHelp {
-		reservedHeight += 7
+		reservedHeight += 6
 	}
 
 	contentHeight := m.height - reservedHeight
@@ -496,25 +405,20 @@ func (m *Model) updateSizes() {
 		contentHeight = 1
 	}
 
+	treeWidth := int(float64(m.width) * 0.20)
+	if treeWidth < 20 {
+		treeWidth = 20
+	}
+
 	// Subtract border height (2) from contentHeight
 	listHeight := contentHeight - 2
 	if listHeight < 1 {
 		listHeight = 1
 	}
+	m.fileList.SetSize(treeWidth, listHeight)
 
-	if m.treeHidden {
+	m.diffViewport.Width = m.width - treeWidth - 4 // border (2) + padding (2) from tree pane
-		m.fileList.SetSize(0, listHeight)
+	m.diffViewport.Height = listHeight
-		m.diffViewport.Width = m.width - 2 // border (2)
-		m.diffViewport.Height = listHeight
-	} else {
-		treeWidth := int(float64(m.width) * 0.20)
-		if treeWidth < 20 {
-			treeWidth = 20
-		}
-		m.fileList.SetSize(treeWidth, listHeight)
-		m.diffViewport.Width = m.width - treeWidth - 4 // border (2) + padding (2) from tree pane
-		m.diffViewport.Height = listHeight
-	}
 }
 
 func (m *Model) updateTreeFocus() {
@@ -532,7 +436,7 @@ func (m Model) View() string {
 	var mainContent string
 	contentHeight := m.height - 2
 	if m.showHelp {
-		contentHeight -= 7
+		contentHeight -= 6
 	}
 	if contentHeight < 0 {
 		contentHeight = 0
@@ -544,6 +448,8 @@ func (m Model) View() string {
 		treeStyle := PaneStyle
 		if m.focus == FocusTree {
 			treeStyle = FocusedPaneStyle
+		} else {
+			treeStyle = PaneStyle
 		}
 
 		treeView := treeStyle.Copy().
@@ -552,84 +458,33 @@ func (m Model) View() string {
 			Render(m.fileList.View())
 
 		var rightPaneView string
-		selectedItem, ok := m.fileList.SelectedItem().(tree.TreeItem)
 
+		selectedItem, ok := m.fileList.SelectedItem().(tree.TreeItem)
 		if ok && selectedItem.IsDir {
 			rightPaneView = m.renderEmptyState(m.diffViewport.Width, m.diffViewport.Height, "Directory: "+selectedItem.Name)
 		} else {
 			var renderedDiff strings.Builder
-
-			// Reserve 2 line for the file header
-			viewportHeight := m.diffViewport.Height - 2
 			start := m.diffViewport.YOffset
-			end := start + viewportHeight
+			end := start + m.diffViewport.Height
 			if end > len(m.diffLines) {
 				end = len(m.diffLines)
 			}
 
-			// Calculate stats
+			// 5 for line number (Width 4 + MarginRight 1), 2 for indent
-			added, deleted := 0, 0
-			for _, line := range m.diffLines {
-				clean := stripAnsi(line)
-				if strings.HasPrefix(clean, "+") && !strings.HasPrefix(clean, "+++") {
-					added++
-				} else if strings.HasPrefix(clean, "-") && !strings.HasPrefix(clean, "---") {
-					deleted++
-				}
-			}
-
-			headerStyle := lipgloss.NewStyle().
-				Foreground(lipgloss.Color("240")).
-				Border(lipgloss.NormalBorder(), false, false, true, false).
-				BorderForeground(lipgloss.Color("236")).
-				Width(m.diffViewport.Width).
-				Padding(0, 1)
-
-			headerText := fmt.Sprintf("%s  (+%d / -%d)", m.selectedPath, added, deleted)
-			header := headerStyle.Render(headerText)
-
 			maxLineWidth := m.diffViewport.Width - 7
 			if maxLineWidth < 1 {
 				maxLineWidth = 1
 			}
 
 			for i := start; i < end; i++ {
-				rawLine := m.diffLines[i]
+				line := ansi.Truncate(m.diffLines[i], maxLineWidth, "")
-				cleanLine := stripAnsi(rawLine)
-				line := ansi.Truncate(rawLine, maxLineWidth, "")
-
-				// Skip Git metadata noise
-				if strings.HasPrefix(cleanLine, "diff --git") ||
-					strings.HasPrefix(cleanLine, "index ") ||
-					strings.HasPrefix(cleanLine, "new file mode") ||
-					strings.HasPrefix(cleanLine, "old mode") ||
-					strings.HasPrefix(cleanLine, "--- /dev/") ||
-					strings.HasPrefix(cleanLine, "+++ b/") {
-					continue
-				}
-
-				// Handle Hunk Headers
-				if strings.HasPrefix(cleanLine, "@@") {
-					content := cleanLine
-					if idx := strings.LastIndex(content, "@@"); idx != -1 {
-						content = content[idx+2:]
-					}
-					content = strings.TrimSpace(content)
-
-					if content == "" {
-						content = "..."
-					}
-
-					divider := lipgloss.NewStyle().Foreground(lipgloss.Color("245")).Render("  › " + content)
-
-					renderedDiff.WriteString("     " + divider + "\n")
-					continue
-				}
 
 				var numStr string
 				mode := "relative"
 
-				if mode != "hidden" {
+				if mode == "hidden" {
+					numStr = ""
+				} else {
 					isCursor := (i == m.diffCursor)
 					if isCursor && mode == "hybrid" {
 						realLine := git.CalculateFileLine(m.diffContent, m.diffCursor)
@@ -650,6 +505,7 @@ func (m Model) View() string {
 				}
 
 				if m.focus == FocusDiff && i == m.diffCursor {
+					cleanLine := stripAnsi(line)
 					line = DiffSelectionStyle.Render("  " + cleanLine)
 				} else {
 					line = "  " + line
@@ -660,19 +516,13 @@ func (m Model) View() string {
 
 			diffContentStr := strings.TrimRight(renderedDiff.String(), "\n")
 
-			diffView := DiffStyle.Copy().
+			rightPaneView = DiffStyle.Copy().
 				Width(m.diffViewport.Width).
-				Height(viewportHeight).
+				Height(m.diffViewport.Height).
 				Render(diffContentStr)
-
-			rightPaneView = lipgloss.JoinVertical(lipgloss.Top, header, diffView)
 		}
 
-		if m.treeHidden {
+		mainContent = lipgloss.JoinHorizontal(lipgloss.Top, treeView, rightPaneView)
-			mainContent = rightPaneView
-		} else {
-			mainContent = lipgloss.JoinHorizontal(lipgloss.Top, treeView, rightPaneView)
-		}
 	}
 
 	var bottomBar string
@@ -723,7 +573,7 @@ func (m Model) renderTopBar() string {
 }
 
 func (m Model) viewStatusBar() string {
-	shortcuts := StatusKeyStyle.Render("? Help  q Quit  Tab Switch  f Flat  t Tree")
+	shortcuts := StatusKeyStyle.Render("? Help  q Quit  Tab Switch")
 	return StatusBarStyle.Width(m.width).Render(shortcuts)
 }
 
@@ -742,9 +592,7 @@ func (m Model) renderHelpDrawer() string {
 	)
 	col4 := lipgloss.JoinVertical(lipgloss.Left,
 		HelpTextStyle.Render("H/M/L Move Cursor"),
-		HelpTextStyle.Render("e     Edit File"),
+		HelpTextStyle.Render("e      Edit File"),
-		HelpTextStyle.Render("f     Flat Tree"),
-		HelpTextStyle.Render("t     Toggle Tree"),
 	)
 
 	return HelpDrawerStyle.Copy().