feat(tui, ci): enhance UX and add static Linux builds

Author: thewizardshell

.github/workflows/build.yml

@@ -32,11 +32,12 @@ jobs:
         env:
           GOOS: ${{ matrix.os }}
           GOARCH: ${{ matrix.arch }}
+          CGO_ENABLED: 0
         run: |
           mkdir -p dist
           BIN_NAME="froggit-${{ matrix.os }}-${{ matrix.arch }}"
           [[ "${{ matrix.os }}" == "windows" ]] && BIN_NAME="$BIN_NAME.exe"
-          go build -o "$BIN_NAME" .
+          go build -ldflags="-s -w" -o "$BIN_NAME" .
           zip -j "dist/${{ matrix.os }}-${{ matrix.arch }}.zip" "$BIN_NAME"
 
       - name: Upload artifact for release

internal/git/actions.go

@@ -229,6 +229,28 @@ func HasCommitsToush() (bool, error) {
 	return NewGitClient("").HasCommitsToush()
 }
 
+func GetFileDiff(filename string, staged bool) (string, error) {
+	return NewGitClient("").GetFileDiff(filename, staged)
+}
+
+func (g *GitClient) GetFileDiff(filename string, staged bool) (string, error) {
+	var args []string
+	if staged {
+		args = []string{"diff", "--cached", "--", filename}
+	} else {
+		args = []string{"diff", "--", filename}
+	}
+	output, err := g.runGitCommand(args...)
+	if err != nil {
+		return "", fmt.Errorf("failed to get diff for %s: %w", filename, err)
+	}
+	result := strings.TrimSpace(string(output))
+	if result == "" {
+		return "No changes to display", nil
+	}
+	return result, nil
+}
+
 func GetStagedDiff() (string, error) {
 	return NewGitClient("").GetStagedDiff()
 }

internal/tui/controls/controls.go

@@ -152,18 +152,23 @@ func NewFileViewControls(staged bool, hasFiles bool, advancedMode bool) *Control
 	if !advancedMode {
 		if hasFiles {
 			cs.Add("space", "stage/unstage", "files")
+			cs.Add("d", "diff", "files")
 			cs.Add("x", "discard changes", "files")
 		}
 		if staged {
 			cs.Add("c", "commit", "files")
 		}
 		cs.Add("a", "stage all", "files")
+		if staged {
+			cs.Add("u", "unstage all", "files")
+		}
 		cs.Add("r", "refresh", "files")
 		cs.Add("f", "fetch", "git")
 		cs.Add("l", "pull", "git")
 		cs.Add("p", "push", "git")
 		cs.Add("b", "branches", "nav")
 		cs.Add("m", "remotes", "nav")
+		cs.Add("A", "advanced", "mode")
 		cs.Add("?", "help", "general")
 	} else {
 		cs.Add("L", "log graph", "advanced")
@@ -316,6 +321,13 @@ func NewHelpViewControls() *ControlSet {
 	return cs
 }
 
+func NewDiffViewControls() *ControlSet {
+	cs := NewControlSet()
+	cs.Add("↑/↓", "scroll", "navigation")
+	cs.Add("esc", "back", "navigation")
+	return cs
+}
+
 func NewLogGraphViewControls() *ControlSet {
 	cs := NewControlSet()
 	cs.Add("↑/↓", "navigate", "navigation")

internal/tui/model/model.go

@@ -27,6 +27,7 @@ const (
 	RebaseView
 	StashView
 	StashMessageView
+	DiffView
 )
 
 type Model struct {
@@ -75,12 +76,16 @@ type Model struct {
 	FileViewOffset int
 	FileViewHeight int
 
+	DiffLines      []string
+	DiffViewOffset int
+
 	IsGeneratingAI   bool
 	CopilotAvailable bool
 
 	DialogType   string
 	DialogTarget string
 
+	MessageID    int
 	AwaitingPush bool
 
 	QuickStartOptions []string

internal/tui/render.go

@@ -62,6 +62,8 @@ func Render(m model.Model, cfg config.Config) string {
 		sb.WriteString(view.RenderStashView(m))
 	case model.StashMessageView:
 		sb.WriteString(view.RenderStashMessageView(m))
+	case model.DiffView:
+		sb.WriteString(view.RenderDiffView(m))
 	}
 
 	if m.Message != "" {

internal/tui/update/async/async.go

@@ -93,6 +93,13 @@ func PerformRemoteChangesCheck(branch string) tea.Cmd {
 	}
 }
 
+// PerformMessageClear returns a Cmd that clears the message after 3 seconds.
+func PerformMessageClear(messageID int) tea.Cmd {
+	return tea.Tick(time.Second*3, func(t time.Time) tea.Msg {
+		return messages.MessageClearMsg{MessageID: messageID}
+	})
+}
+
 // PerformAICommitGeneration generates a commit message using Copilot
 func PerformAICommitGeneration() tea.Cmd {
 	return func() tea.Msg {

internal/tui/update/messages/types.go

@@ -6,3 +6,7 @@ type SwitchBranchMsg struct {
 	NextAction   string
 	SourceBranch string
 }
+
+type MessageClearMsg struct {
+	MessageID int
+}

internal/tui/update/update.go

@@ -163,6 +163,28 @@ func Update(m model.Model, cfg config.Config, msg tea.Msg) (model.Model, tea.Cmd
 			return HandleLogGraphKey(m, msg)
 		}
 
+		if m.CurrentView == model.DiffView {
+			switch msg.String() {
+			case "esc":
+				m.CurrentView = model.FileView
+				m.DiffLines = nil
+				m.DiffViewOffset = 0
+				return m, nil
+			case "up", "k":
+				if m.DiffViewOffset > 0 {
+					m.DiffViewOffset--
+				}
+				return m, nil
+			case "down", "j":
+				if m.DiffViewOffset < len(m.DiffLines)-1 {
+					m.DiffViewOffset++
+				}
+				return m, nil
+			default:
+				return m, nil
+			}
+		}
+
 		if m.CurrentView == model.MergeView {
 			return handlers.HandleMergeView(m, msg)
 		}
@@ -602,6 +624,44 @@ func Update(m model.Model, cfg config.Config, msg tea.Msg) (model.Model, tea.Cmd
 					m.Message = "⚠ No files to stage"
 					m.MessageType = "warning"
 				}
+			case "u":
+				hasStaged := false
+				for _, f := range m.Files {
+					if f.Staged {
+						hasStaged = true
+						break
+					}
+				}
+				if hasStaged {
+					currentFileName := ""
+					if m.Cursor < len(m.Files) {
+						currentFileName = m.Files[m.Cursor].Name
+					}
+					for i := range m.Files {
+						if m.Files[i].Staged {
+							m.Files[i].Staged = false
+							git.Reset(m.Files[i].Name)
+						}
+					}
+					m.Message = "✓ All files unstaged"
+					m.MessageType = "success"
+					files, _ := git.GetModifiedFiles()
+					m.Files = files
+					if currentFileName != "" {
+						for i, file := range m.Files {
+							if file.Name == currentFileName {
+								m.Cursor = i
+								break
+							}
+						}
+					}
+					if m.Cursor >= len(m.Files) && len(m.Files) > 0 {
+						m.Cursor = len(m.Files) - 1
+					}
+				} else {
+					m.Message = "⚠ No staged files to unstage"
+					m.MessageType = "warning"
+				}
 			case "c":
 				ok := false
 				for _, f := range m.Files {
@@ -680,6 +740,20 @@ func Update(m model.Model, cfg config.Config, msg tea.Msg) (model.Model, tea.Cmd
 					m.Message = "⚠ No file selected or no files available"
 					m.MessageType = "warning"
 				}
+			case "d":
+				if len(m.Files) > 0 && m.Cursor < len(m.Files) {
+					file := m.Files[m.Cursor]
+					diff, err := git.GetFileDiff(file.Name, file.Staged)
+					if err != nil {
+						m.Message = fmt.Sprintf("✗ Error getting diff: %s", err)
+						m.MessageType = "error"
+					} else {
+						m.DiffLines = strings.Split(diff, "\n")
+						m.DiffViewOffset = 0
+						m.CurrentView = model.DiffView
+					}
+					return m, nil
+				}
 			case "?":
 				if m.CurrentView == model.FileView {
 					m.CurrentView = model.HelpView
@@ -753,6 +827,19 @@ func Update(m model.Model, cfg config.Config, msg tea.Msg) (model.Model, tea.Cmd
 		if msg.Err == nil {
 			m.HasRemoteChanges = msg.HasChanges
 		}
+
+	case messages.MessageClearMsg:
+		if msg.MessageID == m.MessageID {
+			m.Message = ""
+			m.MessageType = ""
+		}
+		return m, nil
+	}
+
+	// Auto-clear messages after 3 seconds
+	if m.Message != "" {
+		m.MessageID++
+		cmds = append(cmds, async.PerformMessageClear(m.MessageID))
 	}
 
 	if len(cmds) > 0 {

internal/tui/views/commit_view.go

@@ -1,6 +1,7 @@
 package view
 
 import (
+	"fmt"
 	"strings"
 
 	"froggit/internal/tui/controls"
@@ -16,7 +17,18 @@ func RenderCommitView(m model.Model) string {
 	if m.IsGeneratingAI {
 		s.WriteString(styles.InputStyle.Render(m.SpinnerFrames[m.SpinnerIndex]+" Generating...") + "\n\n")
 	} else {
-		s.WriteString(styles.InputStyle.Render(m.CommitMsg+"_") + "\n\n")
+		s.WriteString(styles.InputStyle.Render(m.CommitMsg+"_") + "\n")
+
+		charCount := len(m.CommitMsg)
+		countText := fmt.Sprintf("  %d/72", charCount)
+		if charCount > 72 {
+			s.WriteString(styles.ErrorStyle.Render(countText))
+		} else if charCount > 50 {
+			s.WriteString(styles.WarningStyle.Render(countText))
+		} else {
+			s.WriteString(styles.HelpStyle.Render(countText))
+		}
+		s.WriteString("\n")
 	}
 
 	controlsWidget := controls.NewCommitViewControls(m.CopilotAvailable, m.IsGeneratingAI)

internal/tui/views/diff_view.go

@@ -0,0 +1,61 @@
+package view
+
+import (
+	"fmt"
+	"strings"
+
+	"froggit/internal/tui/controls"
+	"froggit/internal/tui/model"
+	"froggit/internal/tui/styles"
+
+	"github.com/charmbracelet/lipgloss"
+)
+
+var (
+	diffAddStyle = lipgloss.NewStyle().
+			Foreground(lipgloss.Color(styles.Green))
+	diffRemoveStyle = lipgloss.NewStyle().
+			Foreground(lipgloss.Color(styles.Red))
+	diffHunkStyle = lipgloss.NewStyle().
+			Foreground(lipgloss.Color(styles.Cyan))
+)
+
+func RenderDiffView(m model.Model) string {
+	const viewport = 20
+
+	var sb strings.Builder
+
+	sb.WriteString(styles.HeaderStyle.Render("  Diff Preview:") + "\n\n")
+
+	total := len(m.DiffLines)
+	if total == 0 {
+		sb.WriteString(styles.HelpStyle.Render("No diff to display\n"))
+	} else {
+		start := m.DiffViewOffset
+		if start > total-viewport {
+			start = max(0, total-viewport)
+		}
+		end := min(total, start+viewport)
+
+		for i := start; i < end; i++ {
+			line := m.DiffLines[i]
+			if strings.HasPrefix(line, "+") && !strings.HasPrefix(line, "+++") {
+				sb.WriteString(diffAddStyle.Render(line) + "\n")
+			} else if strings.HasPrefix(line, "-") && !strings.HasPrefix(line, "---") {
+				sb.WriteString(diffRemoveStyle.Render(line) + "\n")
+			} else if strings.HasPrefix(line, "@@") {
+				sb.WriteString(diffHunkStyle.Render(line) + "\n")
+			} else {
+				sb.WriteString(styles.NormalStyle.Render(line) + "\n")
+			}
+		}
+	}
+
+	position := fmt.Sprintf("%d/%d", min(m.DiffViewOffset+1, total), total)
+	sb.WriteString("\n" + styles.HelpStyle.Render(position))
+
+	controlsWidget := controls.NewDiffViewControls()
+	sb.WriteString("\n" + controlsWidget.Render())
+
+	return sb.String()
+}