Merge pull request #2 from jr-k/fix/stability

Fix stability

Author: jr-k

internal/dao/swarm/service/service.go

@@ -56,7 +56,7 @@ func (s Service) GetStatusColor() (tcell.Color, tcell.Color) {
 			} else if running > desired {
 				return tcell.ColorMediumPurple, styles.ColorBlack
 			} else if desired > 0 {
-				return styles.ColorStatusGreen, styles.ColorBlack
+				return styles.ColorIdle, styles.ColorBlack
 			}
 		}
 	}

internal/ui/app.go

@@ -2,6 +2,7 @@ package ui
 
 import (
 	"fmt"
+	"sync"
 	"time"
 
 	"runtime/debug"
@@ -27,6 +28,7 @@ import (
 
 type App struct {
 	TviewApp *tview.Application
+	Screen   tcell.Screen
 	Docker   *dao.DockerClient
 
 	// Components
@@ -44,6 +46,11 @@ type App struct {
 	ActiveFilter    string
 	ActiveScope     *common.Scope
 	ActiveInspector common.Inspector
+
+	// Concurrency
+	pauseMx    sync.RWMutex
+	paused     bool
+	stopTicker chan struct{}
 }
 
 // Ensure App implements AppController interface
@@ -76,8 +83,19 @@ func NewApp() *App {
 		panic(err)
 	}
 
+	screen, err := tcell.NewScreen()
+	if err != nil {
+		panic(err)
+	}
+	// We don't Init() here, tview does it on Run() if we set it?
+	// Actually tview.Application.Run() calls screen.Init() if not initialized.
+	
+	tviewApp := tview.NewApplication()
+	tviewApp.SetScreen(screen)
+
 	app := &App{
-		TviewApp: tview.NewApplication(),
+		TviewApp: tviewApp,
+		Screen:   screen,
 		Docker:   docker,
 		Views:    make(map[string]*view.ResourceView),
 		Pages:    tview.NewPages(),
@@ -95,21 +113,48 @@ func (a *App) Run() error {
 		}
 	}()
 
+	// Start auto-refresh
+	a.StartAutoRefresh()
+
+	return a.TviewApp.SetRoot(a.Layout, true).Run()
+}
+
+func (a *App) StartAutoRefresh() {
+	if a.stopTicker != nil {
+		return
+	}
+	a.stopTicker = make(chan struct{})
+
 	go func() {
-		// Initial Delay for UI setup
-		time.Sleep(100 * time.Millisecond)
+		// Initial update
+		// We use a small delay on first run to let UI settle if needed, but only for the first ever run
+		// subsequent restarts of auto-refresh might want immediate effect or wait for next tick.
+		// Let's rely on tick.
+		
+		ticker := time.NewTicker(2 * time.Second)
+		defer ticker.Stop()
+
+		// Immediate update on start
 		a.RefreshCurrentView()
 		a.updateHeader()
 
-		ticker := time.NewTicker(2 * time.Second)
-		defer ticker.Stop()
-		for range ticker.C {
-			a.RefreshCurrentView()
-			a.updateHeader()
+		for {
+			select {
+			case <-ticker.C:
+				a.RefreshCurrentView()
+				a.updateHeader()
+			case <-a.stopTicker:
+				return
+			}
 		}
 	}()
+}
 
-	return a.TviewApp.SetRoot(a.Layout, true).Run()
+func (a *App) StopAutoRefresh() {
+	if a.stopTicker != nil {
+		close(a.stopTicker)
+		a.stopTicker = nil
+	}
 }
 
 func (a *App) initUI() {
@@ -308,6 +353,10 @@ func (a *App) GetTviewApp() *tview.Application {
 	return a.TviewApp
 }
 
+func (a *App) GetScreen() tcell.Screen {
+	return a.Screen
+}
+
 func (a *App) GetDocker() *dao.DockerClient {
 	return a.Docker
 }
@@ -419,3 +468,60 @@ func (a *App) CloseInspector() {
 	a.RestoreFocus()
 	a.UpdateShortcuts()
 }
+
+func (a *App) ActionPause() {
+	a.SetPaused(true)
+}
+
+func (a *App) ActionResume() {
+	a.SetPaused(false)
+	a.TviewApp.Draw() // Force redraw
+}
+
+func (a *App) SetPaused(paused bool) {
+	a.pauseMx.Lock()
+	defer a.pauseMx.Unlock()
+	a.paused = paused
+}
+
+func (a *App) IsPaused() bool {
+	a.pauseMx.RLock()
+	defer a.pauseMx.RUnlock()
+	return a.paused
+}
+
+func (a *App) SafeQueueUpdateDraw(f func()) {
+	a.pauseMx.RLock()
+	isPaused := a.paused
+	a.pauseMx.RUnlock()
+
+	if isPaused {
+		return
+	}
+
+	a.TviewApp.QueueUpdateDraw(func() {
+		a.pauseMx.RLock()
+		isPausedNow := a.paused
+		a.pauseMx.RUnlock()
+
+		if isPausedNow {
+			return
+		}
+		f()
+	})
+}
+
+func (a *App) RunInBackground(task func()) {
+	go func() {
+		defer func() {
+			if r := recover(); r != nil {
+				a.TviewApp.QueueUpdateDraw(func() {
+					a.Flash.SetText(fmt.Sprintf("[red]Background task panic: %v", r))
+					// Also print to stdout for debugging if app is still running or logs are captured
+					fmt.Printf("Background task panic: %v\nStack trace:\n%s\n", r, string(debug.Stack()))
+				})
+			}
+		}()
+		task()
+	}()
+}

internal/ui/app_actions.go

@@ -32,7 +32,7 @@ func (a *App) PerformAction(action func(id string) error, actionName string, col
 
 	a.Flash.SetText(fmt.Sprintf("[yellow]%s %d items...", actionName, len(ids)))
 
-	go func() {
+	a.RunInBackground(func() {
 		var errs []string
 		for _, id := range ids {
 			if err := action(id); err != nil {
@@ -63,7 +63,7 @@ func (a *App) PerformAction(action func(id string) error, actionName string, col
 			}
 			a.UpdateShortcuts()
 		})
-	}()
+	})
 }
 
 // Helper to get target IDs (Multi or Single)
@@ -156,7 +156,7 @@ func (a *App) PerformPrune() {
 
 	dialogs.ShowConfirmation(a, "PRUNE", name, func(force bool) {
 		a.Flash.SetText(fmt.Sprintf("[yellow]Pruning %s...", name))
-		go func() {
+		a.RunInBackground(func() {
 			err := action(a)
 			a.TviewApp.QueueUpdateDraw(func() {
 				if err != nil {
@@ -166,7 +166,7 @@ func (a *App) PerformPrune() {
 					a.RefreshCurrentView()
 				}
 			})
-		}()
+		})
 	})
 	a.UpdateShortcuts()
 }
@@ -237,8 +237,8 @@ func (a *App) PerformCopy() {
 		a.AppendFlash(fmt.Sprintf("[red]Copy error: %v", err))
 	} else {
 		preview := value
-		if len(preview) > 20 {
-			preview = preview[:20] + "..."
+		if len(preview) > 60 {
+			preview = preview[:60] + "..."
 		}
 		a.AppendFlash(fmt.Sprintf("[black:#50fa7b] <copied: %s>[-]", preview))
 	}

internal/ui/app_view.go

@@ -33,9 +33,15 @@ func (a *App) RefreshCurrentView() {
 	// 1. Immediate Updates (Optimistic UI) - Inside Queue not needed if Ticker calls this?
 	// Ticker runs in BG. `UpdateShortcuts` accesses UI. Should be queued.
 	// But let's revert to "working but racy" to fix the "broken views" regression first.
+	// a.UpdateShortcuts() -> Moved inside SafeQueueUpdateDraw if needed, but keeping as is for now unless asked.
+	// NOTE: UpdateShortcuts() calls existing UI methods which might not be thread safe from ticker.
 	a.UpdateShortcuts()
 
-	go func() {
+	a.RunInBackground(func() {
+		if a.IsPaused() {
+			return
+		}
+
 		var err error
 		var data []dao.Resource
 		var headers []string
@@ -45,7 +51,12 @@ func (a *App) RefreshCurrentView() {
 			data, err = v.FetchFunc(a)
 		}
 
-		a.TviewApp.QueueUpdateDraw(func() {
+		// Check pause again after fetching (fetching can take time)
+		if a.IsPaused() {
+			return
+		}
+
+		a.SafeQueueUpdateDraw(func() {
 			// Check if page changed while fetching?
 			currentPage, _ := a.Pages.GetFrontPage()
 			if currentPage != page {
@@ -95,7 +106,7 @@ func (a *App) RefreshCurrentView() {
 				a.Flash.SetText(status)
 			}
 		})
-	}()
+	})
 }
 
 func (a *App) formatViewTitle(viewName string, countStr string, filter string) string {

internal/ui/common/common.go

@@ -26,6 +26,7 @@ type AppController interface {
 	// Accessors
 	GetPages() *tview.Pages
 	GetTviewApp() *tview.Application
+	GetScreen() tcell.Screen
 	GetDocker() *dao.DockerClient
 
 	// Actions
@@ -53,6 +54,14 @@ type AppController interface {
 	// Inspector Management
 	OpenInspector(inspector Inspector)
 	CloseInspector()
+
+	// Async Task Management
+	RunInBackground(task func())
+	SetPaused(paused bool)
+
+	// Refactoring: Auto Refresh Control
+	StartAutoRefresh()
+	StopAutoRefresh()
 }
 
 func FormatSCHeader(key, action string) string {

internal/ui/components/footer/footer.go

@@ -32,9 +32,9 @@ func (f *FlashComponent) Append(text string) {
 	// Assuming the tag starts with " [black:#50fa7b:b] <copied:" and ends with "[-] "
 
 	// Strategy: Split by the start of our known copy tag style
-	// Tag format from app_actions: [black:#50fa7b:b] <copied:
+	// Tag format from app_actions: [black:#50fa7b] <copied:
 
-	const tagStart = " [black:#50fa7b:b] <copied:"
+	const tagStart = " [black:#50fa7b] <copied:"
 
 	if idx := strings.Index(current, tagStart); idx != -1 {
 		current = current[:idx]

internal/ui/components/header/header.go

@@ -94,7 +94,6 @@ func (h *HeaderComponent) Update(stats dao.HostStats, shortcuts []string) {
 		fmt.Sprintf("[orange]Engine:  [white]%s [dim](%s)", stats.Name, stats.Version),
 		fmt.Sprintf("[orange]CPU:     [white]%s", cpuDisplay),
 		fmt.Sprintf("[orange]Mem:     [white]%s", memDisplay),
-		"",
 	}
 
 	statsWidth := 0
@@ -126,9 +125,9 @@ func (h *HeaderComponent) Update(stats dao.HostStats, shortcuts []string) {
 	logoWidth += 2 // Padding
 
 	// 3. Shortcuts View
-	// Max 7 per column (matches header height)
+	// Max 6 per column (matches header height)
 	// Each shortcut uses 2 columns: alias (fixed width) and label
-	const maxPerCol = 7
+	const maxPerCol = 6
 	const groupSpacer = "      " // Spacer between shortcut groups
 
 	// Organize shortcuts into columns, respecting color changes

internal/ui/components/inspect/log_inspector.go

@@ -49,9 +49,9 @@ func NewLogInspector(id, subject, resourceType string) *LogInspector {
 		AutoScroll:   true,
 		Wrap:         false,
 		Timestamps:   false,
-		since:        "5m",
-		tail:         "all",
-		sinceLabel:   "5m",
+		since:        "",
+		tail:         "200",
+		sinceLabel:   "Tail",
 	}
 }