fix: cleanup styles

Author: hay-kot

internal/core/session/session.go

@@ -17,6 +17,7 @@ type Session struct {
 	Name      string    `json:"name"`
 	Path      string    `json:"path"`
 	Remote    string    `json:"remote"`
+	Prompt    string    `json:"prompt,omitempty"`
 	State     State     `json:"state"`
 	CreatedAt time.Time `json:"created_at"`
 	UpdatedAt time.Time `json:"updated_at"`

internal/hive/service.go

@@ -112,6 +112,7 @@ func (s *Service) CreateSession(ctx context.Context, opts CreateOptions) (*sessi
 			Name:      opts.Name,
 			Path:      path,
 			Remote:    remote,
+			Prompt:    opts.Prompt,
 			State:     session.StateActive,
 			CreatedAt: now,
 			UpdatedAt: now,

internal/tui/delegate.go

@@ -52,7 +52,7 @@ func NewSessionDelegate() SessionDelegate {
 
 // Height returns the height of each item.
 func (d SessionDelegate) Height() int {
-	return 2
+	return 3
 }
 
 // Spacing returns the spacing between items.
@@ -92,6 +92,18 @@ func (d SessionDelegate) Render(w io.Writer, m list.Model, index int, item list.
 	state := stateStyle.Render(string(s.State))
 	desc := fmt.Sprintf("%s  %s", state, s.Path)
 
+	// Build prompt line if present
+	prompt := ""
+	if s.Prompt != "" {
+		// Truncate long prompts
+		maxPromptLen := 80
+		displayPrompt := s.Prompt
+		if len(displayPrompt) > maxPromptLen {
+			displayPrompt = displayPrompt[:maxPromptLen-3] + "..."
+		}
+		prompt = fmt.Sprintf("  %s", lipgloss.NewStyle().Foreground(colorGray).Render(displayPrompt))
+	}
+
 	// Apply selection styling
 	var titleStyle lipgloss.Style
 	if isSelected {
@@ -104,5 +116,8 @@ func (d SessionDelegate) Render(w io.Writer, m list.Model, index int, item list.
 
 	// Write to output
 	_, _ = fmt.Fprintf(w, "%s\n", titleStyle.Render(title))
-	_, _ = fmt.Fprintf(w, "  %s", desc)
+	_, _ = fmt.Fprintf(w, "  %s\n", desc)
+	if prompt != "" {
+		_, _ = fmt.Fprint(w, prompt)
+	}
 }

internal/tui/keybindings.go

@@ -3,9 +3,12 @@ package tui
 import (
 	"context"
 	"fmt"
+	"maps"
 	"os/exec"
+	"slices"
 	"strings"
 
+	"github.com/charmbracelet/bubbles/key"
 	"github.com/hay-kot/hive/internal/core/config"
 	"github.com/hay-kot/hive/internal/core/session"
 	"github.com/hay-kot/hive/internal/hive"
@@ -135,10 +138,14 @@ func (h *KeybindingHandler) executeShell(_ context.Context, cmd string) error {
 	return c.Run()
 }
 
-// HelpEntries returns all configured keybindings for display.
+// HelpEntries returns all configured keybindings for display, sorted by key.
 func (h *KeybindingHandler) HelpEntries() []string {
+	// Get sorted keys for consistent ordering
+	keys := slices.Sorted(maps.Keys(h.keybindings))
+
 	entries := make([]string, 0, len(h.keybindings))
-	for key, kb := range h.keybindings {
+	for _, key := range keys {
+		kb := h.keybindings[key]
 		help := kb.Help
 		if help == "" && kb.Action != "" {
 			help = kb.Action
@@ -156,3 +163,27 @@ func (h *KeybindingHandler) HelpString() string {
 	entries := h.HelpEntries()
 	return strings.Join(entries, "  ")
 }
+
+// KeyBindings returns key.Binding objects for integration with bubbles help system.
+func (h *KeybindingHandler) KeyBindings() []key.Binding {
+	keys := slices.Sorted(maps.Keys(h.keybindings))
+	bindings := make([]key.Binding, 0, len(keys))
+
+	for _, k := range keys {
+		kb := h.keybindings[k]
+		help := kb.Help
+		if help == "" && kb.Action != "" {
+			help = kb.Action
+		}
+		if help == "" {
+			help = "shell"
+		}
+
+		bindings = append(bindings, key.NewBinding(
+			key.WithKeys(k),
+			key.WithHelp(k, help),
+		))
+	}
+
+	return bindings
+}

internal/tui/model.go

@@ -3,7 +3,9 @@ package tui
 import (
 	"context"
 
+	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/bubbles/list"
+	"github.com/charmbracelet/bubbles/spinner"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/hay-kot/hive/internal/core/config"
@@ -17,20 +19,23 @@ type UIState int
 const (
 	stateNormal UIState = iota
 	stateConfirming
+	stateLoading
 )
 
 // Model is the main Bubble Tea model for the TUI.
 type Model struct {
-	service  *hive.Service
-	list     list.Model
-	handler  *KeybindingHandler
-	state    UIState
-	modal    Modal
-	pending  Action
-	width    int
-	height   int
-	err      error
-	quitting bool
+	service        *hive.Service
+	list           list.Model
+	handler        *KeybindingHandler
+	state          UIState
+	modal          Modal
+	pending        Action
+	width          int
+	height         int
+	err            error
+	spinner        spinner.Model
+	loadingMessage string
+	quitting       bool
 }
 
 // sessionsLoadedMsg is sent when sessions are loaded.
@@ -55,17 +60,27 @@ func New(service *hive.Service, cfg *config.Config) Model {
 
 	handler := NewKeybindingHandler(cfg.Keybindings, service)
 
+	// Add custom keybindings to list help
+	l.AdditionalShortHelpKeys = func() []key.Binding {
+		return handler.KeyBindings()
+	}
+
+	s := spinner.New()
+	s.Spinner = spinner.Dot
+	s.Style = spinnerStyle
+
 	return Model{
 		service: service,
 		list:    l,
 		handler: handler,
 		state:   stateNormal,
+		spinner: s,
 	}
 }
 
 // Init initializes the model.
 func (m Model) Init() tea.Cmd {
-	return m.loadSessions()
+	return tea.Batch(m.loadSessions(), m.spinner.Tick)
 }
 
 // loadSessions returns a command that loads sessions from the service.
@@ -90,24 +105,29 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case tea.WindowSizeMsg:
 		m.width = msg.Width
 		m.height = msg.Height
-		m.list.SetSize(msg.Width, msg.Height-2) // Leave room for help bar
+		m.list.SetSize(msg.Width, msg.Height)
 		return m, nil
 
 	case sessionsLoadedMsg:
 		if msg.err != nil {
 			m.err = msg.err
+			m.state = stateNormal
 			return m, nil
 		}
 		items := make([]list.Item, len(msg.sessions))
 		for i, s := range msg.sessions {
 			items[i] = SessionItem{Session: s}
 		}
 		m.list.SetItems(items)
+		m.state = stateNormal
 		return m, nil
 
 	case actionCompleteMsg:
 		if msg.err != nil {
 			m.err = msg.err
+			m.state = stateNormal
+			m.pending = Action{}
+			return m, nil
 		}
 		m.state = stateNormal
 		m.pending = Action{}
@@ -116,6 +136,11 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	case tea.KeyMsg:
 		return m.handleKey(msg)
+
+	case spinner.TickMsg:
+		var cmd tea.Cmd
+		m.spinner, cmd = m.spinner.Update(msg)
+		return m, cmd
 	}
 
 	var cmd tea.Cmd
@@ -164,6 +189,9 @@ func (m Model) handleKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 			m.modal = NewModal("Confirm", action.Confirm)
 			return m, nil
 		}
+		// Show loading state for action
+		m.state = stateLoading
+		m.loadingMessage = "Processing..."
 		return m, m.executeAction(action)
 	}
 
@@ -192,14 +220,22 @@ func (m Model) View() string {
 		return ""
 	}
 
-	if m.err != nil {
-		return errorStyle.Render("Error: " + m.err.Error())
-	}
-
 	// Build main view
-	listView := m.list.View()
-	helpBar := helpStyle.Render("[q] quit  " + m.handler.HelpString())
-	mainView := lipgloss.JoinVertical(lipgloss.Left, listView, helpBar)
+	mainView := m.list.View()
+
+	// Overlay loading spinner if loading
+	if m.state == stateLoading {
+		w, h := m.width, m.height
+		if w == 0 {
+			w = 80
+		}
+		if h == 0 {
+			h = 24
+		}
+		loadingView := lipgloss.JoinHorizontal(lipgloss.Left, m.spinner.View(), " "+m.loadingMessage)
+		modal := NewModal("", loadingView)
+		return modal.Overlay(mainView, w, h)
+	}
 
 	// Overlay modal if confirming
 	if m.state == stateConfirming {

internal/tui/styles.go

@@ -10,7 +10,6 @@ import (
 var (
 	colorGreen  = lipgloss.Color("#a6e3a1")
 	colorYellow = lipgloss.Color("#f9e2af")
-	colorRed    = lipgloss.Color("#f38ba8")
 	colorBlue   = lipgloss.Color("#89b4fa")
 	colorGray   = lipgloss.Color("#6c7086")
 	colorWhite  = lipgloss.Color("#cdd6f4")
@@ -32,10 +31,6 @@ var (
 	recycledStyle = lipgloss.NewStyle().
 			Foreground(colorYellow)
 
-	// Help text style.
-	helpStyle = lipgloss.NewStyle().
-			Foreground(colorGray)
-
 	// Selected item style.
 	selectedStyle = lipgloss.NewStyle().
 			Foreground(colorWhite).
@@ -44,10 +39,6 @@ var (
 	// Normal item style.
 	normalStyle = lipgloss.NewStyle().
 			Foreground(colorGray)
-
-	// Error message style.
-	errorStyle = lipgloss.NewStyle().
-			Foreground(colorRed)
 )
 
 // Modal styles using lipgloss v2 for canvas/layer support.
@@ -64,4 +55,8 @@ var (
 	modalHelpStyle = lipglossv2.NewStyle().
 			Foreground(lipglossv2.Color("#6c7086")).
 			MarginTop(1)
+
+	// Spinner style.
+	spinnerStyle = lipgloss.NewStyle().
+			Foreground(colorBlue)
 )