merge

Author: tstromberg

cmd/goose/main.go

@@ -331,7 +331,31 @@ func (app *App) onReady(ctx context.Context) {
 					app.mu.Unlock()
 
 					// Load current user
-					loadCurrentUser(ctx, app)
+					if app.client != nil {
+						var user *github.User
+						err := retry.Do(func() error {
+							var retryErr error
+							user, _, retryErr = app.client.Users.Get(ctx, "")
+							if retryErr != nil {
+								slog.Warn("GitHub Users.Get failed (will retry)", "error", retryErr)
+								return retryErr
+							}
+							return nil
+						},
+							retry.Attempts(maxRetries),
+							retry.DelayType(retry.CombineDelay(retry.BackOffDelay, retry.RandomDelay)),
+							retry.MaxDelay(maxRetryDelay),
+							retry.OnRetry(func(n uint, err error) {
+								slog.Debug("[RETRY] Retrying GitHub API call", "attempt", n, "error", err)
+							}),
+						)
+						if err == nil && user != nil {
+							if app.targetUser == "" {
+								app.targetUser = user.GetLogin()
+								slog.Info("Set target user to current user", "user", app.targetUser)
+							}
+						}
+					}
 
 					// Update tooltip
 					tooltip := "Goose - Loading PRs..."

cmd/goose/notifications.go

@@ -95,12 +95,7 @@ func (app *App) processNotifications(ctx context.Context) {
 			slog.Debug("[NOTIFY] Updating menu after notifications")
 			app.updateMenu(ctx)
 		}
-
-		// Auto-open if enabled
-		if app.enableAutoBrowser && time.Since(app.startTime) > startupGracePeriod {
-			app.tryAutoOpenPR(ctx, pr, app.enableAutoBrowser, app.startTime)
-		}
-	}
+	}()
 
 	// Update menu if we sent notifications
 	if len(toNotify) > 0 {

cmd/goose/systray_interface.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"log/slog"
+
 	"github.com/energye/systray"
 )
 
@@ -19,10 +21,12 @@ type SystrayInterface interface {
 type RealSystray struct{}
 
 func (*RealSystray) ResetMenu() {
+	slog.Debug("[SYSTRAY] ResetMenu called")
 	systray.ResetMenu()
 }
 
 func (*RealSystray) AddMenuItem(title, tooltip string) MenuItem {
+	slog.Debug("[SYSTRAY] AddMenuItem called", "title", title)
 	item := systray.AddMenuItem(title, tooltip)
 	return &RealMenuItem{MenuItem: item}
 }
@@ -32,6 +36,7 @@ func (*RealSystray) AddSeparator() {
 }
 
 func (*RealSystray) SetTitle(title string) {
+	slog.Info("[SYSTRAY] SetTitle called", "title", title, "len", len(title))
 	systray.SetTitle(title)
 }
 

cmd/goose/ui.go

@@ -193,23 +193,46 @@ func (app *App) setTrayTitle() {
 	// Set title and icon based on PR state
 	var title string
 	var iconType IconType
-	switch {
-	case counts.IncomingBlocked == 0 && counts.OutgoingBlocked == 0:
-		title = ""
-		iconType = IconSmiling
-	case counts.IncomingBlocked > 0 && counts.OutgoingBlocked > 0:
-		title = fmt.Sprintf("%d / %d", counts.IncomingBlocked, counts.OutgoingBlocked)
-		iconType = IconBoth
-	case counts.IncomingBlocked > 0:
-		title = fmt.Sprintf("%d", counts.IncomingBlocked)
-		iconType = IconGoose
-	default:
-		title = fmt.Sprintf("%d", counts.OutgoingBlocked)
-		iconType = IconPopper
+
+	// On Linux, always show counts if there are any PRs
+	// This helps since not all desktop environments show the text
+	if runtime.GOOS == "linux" && (counts.IncomingTotal > 0 || counts.OutgoingTotal > 0) {
+		// Show blocked/total format for better visibility
+		if counts.IncomingBlocked > 0 && counts.OutgoingBlocked > 0 {
+			title = fmt.Sprintf("%d/%d • %d/%d", counts.IncomingBlocked, counts.IncomingTotal, counts.OutgoingBlocked, counts.OutgoingTotal)
+			iconType = IconBoth
+		} else if counts.IncomingBlocked > 0 {
+			title = fmt.Sprintf("%d/%d", counts.IncomingBlocked, counts.IncomingTotal)
+			iconType = IconGoose
+		} else if counts.OutgoingBlocked > 0 {
+			title = fmt.Sprintf("%d/%d", counts.OutgoingBlocked, counts.OutgoingTotal)
+			iconType = IconPopper
+		} else {
+			// No blocked PRs but there are PRs
+			title = fmt.Sprintf("0/%d", counts.IncomingTotal+counts.OutgoingTotal)
+			iconType = IconSmiling
+		}
+	} else {
+		// Original behavior for other platforms
+		switch {
+		case counts.IncomingBlocked == 0 && counts.OutgoingBlocked == 0:
+			title = ""
+			iconType = IconSmiling
+		case counts.IncomingBlocked > 0 && counts.OutgoingBlocked > 0:
+			title = fmt.Sprintf("%d / %d", counts.IncomingBlocked, counts.OutgoingBlocked)
+			iconType = IconBoth
+		case counts.IncomingBlocked > 0:
+			title = fmt.Sprintf("%d", counts.IncomingBlocked)
+			iconType = IconGoose
+		default:
+			title = fmt.Sprintf("%d", counts.OutgoingBlocked)
+			iconType = IconPopper
+		}
 	}
 
 	// Log title change with detailed counts
-	slog.Debug("[TRAY] Setting title and icon",
+	slog.Info("[TRAY] Setting title and icon",
+		"os", runtime.GOOS,
 		"title", title,
 		"icon", iconType,
 		"incoming_total", counts.IncomingTotal,
@@ -533,9 +556,17 @@ func (app *App) generatePRSectionTitles(prs []PR, sectionTitle string, hiddenOrg
 // rebuildMenu completely rebuilds the menu from scratch.
 func (app *App) rebuildMenu(ctx context.Context) {
 	// Rebuild entire menu
+	slog.Info("[MENU] Starting rebuildMenu", "os", runtime.GOOS)
 
 	// Clear all existing menu items
 	app.systrayInterface.ResetMenu()
+	slog.Info("[MENU] Called ResetMenu")
+
+	// On Linux, add a small delay to ensure DBus properly processes the reset
+	// This helps prevent menu item duplication
+	if runtime.GOOS == "linux" {
+		time.Sleep(50 * time.Millisecond)
+	}
 
 	// Check for errors (auth or connection failures)
 	app.mu.RLock()