run make fix

Author: tstromberg

cmd/goose/deadlock_test.go

@@ -42,7 +42,7 @@ func TestConcurrentMenuOperations(t *testing.T) {
 	}()
 
 	// Simulate concurrent menu clicks (write lock operations)
-	for i := 0; i < concurrentOps; i++ {
+	for range concurrentOps {
 		go func() {
 			defer wg.Done()
 
@@ -55,7 +55,7 @@ func TestConcurrentMenuOperations(t *testing.T) {
 	}
 
 	// Simulate concurrent menu generation (read lock operations)
-	for i := 0; i < concurrentOps; i++ {
+	for range concurrentOps {
 		go func() {
 			defer wg.Done()
 
@@ -65,7 +65,7 @@ func TestConcurrentMenuOperations(t *testing.T) {
 	}
 
 	// Simulate concurrent PR updates (write lock operations)
-	for i := 0; i < concurrentOps; i++ {
+	for i := range concurrentOps {
 		go func(iteration int) {
 			defer wg.Done()
 
@@ -154,7 +154,7 @@ func TestRapidMenuClicks(t *testing.T) {
 	clickCount := 20
 	successfulClicks := 0
 
-	for i := 0; i < clickCount; i++ {
+	for range clickCount {
 		// Check if enough time has passed for rate limiting
 		app.mu.RLock()
 		timeSince := time.Since(app.lastSearchAttempt)

cmd/goose/main.go

@@ -64,37 +64,34 @@ type PR struct {
 
 // App holds the application state.
 type App struct {
+	lastSearchAttempt   time.Time
 	lastSuccessfulFetch time.Time
-	lastSearchAttempt   time.Time // For rate limiting forced refreshes
-	lastMenuTitles      []string  // For change detection to prevent unnecessary redraws
 	startTime           time.Time
+	systrayInterface    SystrayInterface
+	browserRateLimiter  *BrowserRateLimiter
+	blockedPRTimes      map[string]time.Time
+	currentUser         *github.User
+	stateManager        *PRStateManager
 	client              *github.Client
+	hiddenOrgs          map[string]bool
+	seenOrgs            map[string]bool
 	turnClient          *turn.Client
-	currentUser         *github.User
-	stateManager        *PRStateManager // NEW: Centralized state management
-	browserRateLimiter  *BrowserRateLimiter
-	targetUser          string
-	cacheDir            string
+	previousBlockedPRs  map[string]bool
 	authError           string
-	incoming            []PR
+	cacheDir            string
+	targetUser          string
+	lastMenuTitles      []string
 	outgoing            []PR
+	incoming            []PR
 	updateInterval      time.Duration
 	consecutiveFailures int
 	mu                  sync.RWMutex
-	menuInitialized     bool
-	initialLoadComplete bool
-	enableAudioCues     bool
 	enableAutoBrowser   bool
 	hideStaleIncoming   bool
 	noCache             bool
-	systrayInterface    SystrayInterface // For mocking systray operations in tests
-	hiddenOrgs          map[string]bool
-	seenOrgs            map[string]bool
-
-	// Deprecated: These fields are kept for backward compatibility with tests
-	// The actual state is managed by stateManager
-	previousBlockedPRs map[string]bool      // Deprecated: use stateManager
-	blockedPRTimes     map[string]time.Time // Deprecated: use stateManager
+	enableAudioCues     bool
+	initialLoadComplete bool
+	menuInitialized     bool
 }
 
 func loadCurrentUser(ctx context.Context, app *App) {

cmd/goose/menu_item_interface.go

@@ -66,12 +66,12 @@ func (r *RealMenuItem) AddSubMenuItem(title, tooltip string) MenuItem {
 
 // MockMenuItem implements MenuItem for testing without calling systray functions.
 type MockMenuItem struct {
+	clickHandler func()
 	title        string
 	tooltip      string
+	subItems     []MenuItem
 	disabled     bool
 	checked      bool
-	clickHandler func()
-	subItems     []MenuItem
 }
 
 // Ensure MockMenuItem implements MenuItem interface.

cmd/goose/pr_state.go

@@ -9,20 +9,18 @@ import (
 
 // PRState tracks the complete state of a PR including blocking history.
 type PRState struct {
-	PR              PR
 	FirstBlockedAt  time.Time
 	LastSeenBlocked time.Time
-	HasNotified     bool // Have we already notified about this PR being blocked?
+	PR              PR
+	HasNotified     bool
 }
 
 // PRStateManager manages all PR states with proper synchronization.
 type PRStateManager struct {
-	mu     sync.RWMutex
-	states map[string]*PRState // Key is PR URL
-
-	// Configuration
 	startTime          time.Time
+	states             map[string]*PRState
 	gracePeriodSeconds int
+	mu                 sync.RWMutex
 }
 
 // NewPRStateManager creates a new PR state manager.

cmd/goose/settings.go

@@ -10,10 +10,10 @@ import (
 
 // Settings represents persistent user settings.
 type Settings struct {
+	HiddenOrgs        map[string]bool `json:"hidden_orgs"`
 	EnableAudioCues   bool            `json:"enable_audio_cues"`
 	HideStale         bool            `json:"hide_stale"`
 	EnableAutoBrowser bool            `json:"enable_auto_browser"`
-	HiddenOrgs        map[string]bool `json:"hidden_orgs"`
 }
 
 // settingsDir returns the configuration directory for settings.