Merge remote-tracking branch 'upstream/main'

Author: Thomas Stromberg

Makefile

@@ -170,7 +170,14 @@ install-darwin: app-bundle
 install-unix: build
 	@echo "Installing on $(shell uname)..."
 	@echo "Installing binary to /usr/local/bin..."
-	@sudo install -m 755 out/$(APP_NAME) /usr/local/bin/
+	@if command -v sudo >/dev/null 2>&1; then \
+		sudo install -m 755 out/$(APP_NAME) /usr/local/bin/; \
+	elif command -v doas >/dev/null 2>&1; then \
+		doas install -m 755 out/$(APP_NAME) /usr/local/bin/; \
+	else \
+		echo "Error: Neither sudo nor doas found. Please install the binary manually."; \
+		exit 1; \
+	fi
 	@echo "Installation complete! $(APP_NAME) has been installed to /usr/local/bin"
 
 # Install on Windows

README.md

@@ -12,24 +12,6 @@ The only PR tracker that honks at you when you're the bottleneck. Now shipping w
 Lives in your menubar like a tiny waterfowl of productivity shame, watching your GitHub PRs and making aggressive bird sounds when you're blocking someone's code from seeing the light of production.
 
 ![Review Goose Screenshot](media/screenshot.png)
-
-## What It Does
-
-- **Honks** when you're blocking someone's PR (authentic goose noises included)
-- **Jet sounds** when your own PR is ready for the next stage
-- **Smart turn-based assignment** - knows who is blocking a PR, knows when tests are failing, etc.
-- **Auto-start** on login (macOS)
-- **Auto-open** incoming PRs in your browser (off by default, rate-limited)
-- **Org Filtering** for orgs you may not care about in a home or work context
-* **Multi-platform** support for Linux, macOS, Windows, FreeBSD, whatever.
-
-You can also visit the web-based dashboard at https://dash.ready-to-review.dev/
-
-## Dependencies
-
-* [go](https://go.dev/) 1.23.4 or higher
-* [gh](https://cli.github.com/), AKA the GitHub command-line utility
-
 ## macOS Quick Start ⚡ (Get Honked At)
 
 Install dependencies:
@@ -53,7 +35,19 @@ cd goose && make run
 
 This will will cause the goose to implant itself into `/Applications/Review Goose.app` for future invocations. To be persistently annoyed every time you login, click the `Start at Login` menu item.
 
-### Using a fine-grained access token
+## Linux/BSD/Windows Quick Start
+
+1. Install the GitHub CLI and Go via your platforms recommended methods
+2. Compile and install Goose:
+
+```bash
+go install github.com/codeGROOVE-dev/goose/cmd/goose@latest
+```
+
+3. Copy goose from $HOME/go/bin to wherever you prefer
+4. Add goose to your auto-login so you never foget about PRs again
+
+## Using a fine-grained access token
 
 If you want more control over which repositories the goose can access, you can use a [fine-grained personal access token](https://github.com/settings/personal-access-tokens/new) with the following permissions:
 
@@ -68,13 +62,19 @@ env GITHUB_TOKEN=your_token_here goose
 
 We don't yet persist fine-grained tokens to disk - PR's welcome!
 
+## Usage
+
+- **macOS/Windows**: Click the tray icon to show the menu
+- **Linux/BSD**: Right-click the tray icon to show the menu (left-click refreshes PRs)
+
 ## Known Issues
 
-- Visual notifications won't work on macOS until we release signed binaries.
+- Visual notifications won't work reliably on macOS until we release signed binaries.
+- Tray icons on GNOME require [snixembed](https://git.sr.ht/~steef/snixembed) and enabling the [Legacy Tray extension](https://www.omgubuntu.co.uk/2024/08/gnome-official-status-icons-extension). Goose will automatically launch snixembed if needed, but you must install it first (e.g., `apt install snixembed` or `yay -S snixembed`).
 
 ## Pricing
 
-- Free forever for public repositories ❤️
+- Free forever for public open-source repositories ❤️
 - Private repo access will soon be a supporter-only feature to ensure the goose is fed. ($1/mo)
 
 ## Privacy
@@ -85,6 +85,10 @@ We don't yet persist fine-grained tokens to disk - PR's welcome!
 - No data is resold to anyone. We don't even want it.
 - No telemetry is collected
 
+## License
+
+This project is licensed under the GPL-3.0 License - see the [LICENSE](LICENSE) file for details.
+
 ---
 
 Built with 🪿 by [codeGROOVE](https://codegroove.dev/) - PRs welcome!

cmd/goose/cache.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/codeGROOVE-dev/goose/pkg/safebrowse"
 	"github.com/codeGROOVE-dev/retry"
 	"github.com/codeGROOVE-dev/turnclient/pkg/turn"
 )
@@ -97,7 +98,7 @@ func (app *App) checkCache(cacheFile, url string, updatedAt time.Time) (cachedDa
 func (app *App) turnData(ctx context.Context, url string, updatedAt time.Time) (*turn.CheckResponse, bool, error) {
 	hasRunningTests := false
 	// Validate URL before processing
-	if err := validateURL(url); err != nil {
+	if err := safebrowse.ValidateURL(url); err != nil {
 		return nil, false, fmt.Errorf("invalid URL: %w", err)
 	}
 

cmd/goose/icons.go

@@ -4,9 +4,9 @@ import (
 	"log/slog"
 )
 
-// Icon variables are defined in platform-specific files:
-// - icons_windows.go: uses .ico files.
-// - icons_unix.go: uses .png files.
+// Icon implementations are in platform-specific files:
+//   - icons_darwin.go: macOS (static PNG icons, counts shown in title)
+//   - icons_badge.go: Linux/BSD/Windows (dynamic circle badges with counts)
 
 // IconType represents different icon states.
 type IconType int
@@ -21,33 +21,20 @@ const (
 	IconLock                      // Authentication error
 )
 
-// getIcon returns the icon bytes for the given type.
-func getIcon(iconType IconType) []byte {
-	switch iconType {
-	case IconGoose, IconBoth:
-		// For both, we'll use the goose icon as primary
-		return iconGoose
-	case IconPopper:
-		return iconPopper
-	case IconCockroach:
-		return iconCockroach
-	case IconWarning:
-		return iconWarning
-	case IconLock:
-		return iconLock
-	default:
-		return iconSmiling
-	}
-}
+// getIcon returns icon bytes for the given type and counts.
+// Implementation is platform-specific:
+//   - macOS: returns static icons (counts displayed in title bar)
+//   - Linux/Windows: generates dynamic badges with embedded counts.
+// Implemented in icons_darwin.go and icons_badge.go.
 
-// setTrayIcon updates the system tray icon based on PR counts.
-func (app *App) setTrayIcon(iconType IconType) {
-	iconBytes := getIcon(iconType)
+// setTrayIcon updates the system tray icon.
+func (app *App) setTrayIcon(iconType IconType, counts PRCounts) {
+	iconBytes := getIcon(iconType, counts)
 	if len(iconBytes) == 0 {
-		slog.Warn("Icon bytes are empty, skipping icon update", "type", iconType)
+		slog.Warn("icon bytes empty, skipping update", "type", iconType)
 		return
 	}
 
 	app.systrayInterface.SetIcon(iconBytes)
-	slog.Debug("[TRAY] Setting icon", "type", iconType)
+	slog.Debug("tray icon updated", "type", iconType, "incoming", counts.IncomingBlocked, "outgoing", counts.OutgoingBlocked)
 }

cmd/goose/icons_badge.go

@@ -0,0 +1,71 @@
+//go:build (linux || freebsd || openbsd || netbsd || dragonfly || solaris || illumos || aix || windows) && !darwin
+
+package main
+
+import (
+	_ "embed"
+	"log/slog"
+	"sync"
+
+	"github.com/codeGROOVE-dev/goose/pkg/icon"
+)
+
+// Linux, BSD, and Windows use dynamic circle badges since they don't support title text.
+
+//go:embed icons/smiling-face.png
+var iconSmilingSource []byte
+
+//go:embed icons/warning.png
+var iconWarning []byte
+
+//go:embed icons/lock.png
+var iconLock []byte
+
+var (
+	cache = icon.NewCache()
+
+	smiling     []byte
+	smilingOnce sync.Once
+)
+
+func getIcon(iconType IconType, counts PRCounts) []byte {
+	// Static icons for error states
+	if iconType == IconWarning {
+		return iconWarning
+	}
+	if iconType == IconLock {
+		return iconLock
+	}
+
+	incoming := counts.IncomingBlocked
+	outgoing := counts.OutgoingBlocked
+
+	// Happy face when nothing is blocked
+	if incoming == 0 && outgoing == 0 {
+		smilingOnce.Do(func() {
+			scaled, err := icon.Scale(iconSmilingSource)
+			if err != nil {
+				slog.Error("failed to scale happy face icon", "error", err)
+				smiling = iconSmilingSource
+				return
+			}
+			smiling = scaled
+		})
+		return smiling
+	}
+
+	// Check cache
+	if cached, ok := cache.Get(incoming, outgoing); ok {
+		return cached
+	}
+
+	// Generate badge
+	badge, err := icon.Badge(incoming, outgoing)
+	if err != nil {
+		slog.Error("failed to generate badge", "error", err, "incoming", incoming, "outgoing", outgoing)
+		return smiling
+	}
+
+	cache.Put(incoming, outgoing, badge)
+	return badge
+}

cmd/goose/icons_darwin.go

@@ -0,0 +1,42 @@
+//go:build darwin
+
+package main
+
+import _ "embed"
+
+// macOS displays counts in the title bar, so icons remain static.
+
+//go:embed icons/goose.png
+var iconGoose []byte
+
+//go:embed icons/popper.png
+var iconPopper []byte
+
+//go:embed icons/smiling-face.png
+var iconSmiling []byte
+
+//go:embed icons/lock.png
+var iconLock []byte
+
+//go:embed icons/warning.png
+var iconWarning []byte
+
+//go:embed icons/cockroach.png
+var iconCockroach []byte
+
+func getIcon(iconType IconType, counts PRCounts) []byte {
+	switch iconType {
+	case IconGoose, IconBoth:
+		return iconGoose
+	case IconPopper:
+		return iconPopper
+	case IconCockroach:
+		return iconCockroach
+	case IconWarning:
+		return iconWarning
+	case IconLock:
+		return iconLock
+	default:
+		return iconSmiling
+	}
+}

cmd/goose/icons_unix.go

@@ -1,6 +1,5 @@
 //go:build !darwin
 
-// Package main - loginitem_other.go provides stub functions for non-macOS platforms.
 package main
 
 import "context"