address merge conflict

Author: tstromberg

.github/workflows/ci.yml

@@ -2,38 +2,45 @@ name: CI
 
 on:
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
   push:
-    branches: [ main ]
+    branches:
+      - main
 
-permissions:
-  contents: read
+permissions: {}
 
 jobs:
   test:
     name: Test
+
     runs-on: ${{ matrix.os }}
+
+    permissions:
+      contents: read
+
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        go-version: ['1.21']
+        os:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
-          go-version: ${{ matrix.go-version }}
-          cache: true
+          go-version: '1.24'
+          check-latest: 'true'
+          cache: 'true'
 
       - name: Install dependencies (Linux)
-        if: matrix.os == 'ubuntu-latest'
+        if: ${{ matrix.os == 'ubuntu-latest' }}
         run: sudo apt-get update && sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev
 
-      - name: Lint
-        if: matrix.os != 'windows-latest'
-        run: make lint
-
       - name: Build
         run: make build
 

.github/workflows/golangci-lint.yml

@@ -0,0 +1,28 @@
+name: golangci-lint
+
+on:
+  pull_request:
+    branches:
+      - 'main'
+
+permissions: {}
+
+jobs:
+  golangci-lint:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+        with:
+          go-version: '1.24'
+          check-latest: true
+
+      - name: golangci-lint
+        run: |
+          make lint

Makefile

@@ -77,50 +77,50 @@ install-appify:
 app-bundle: out build-darwin install-appify
 	@echo "Removing old app bundle..."
 	@rm -rf "out/$(BUNDLE_NAME).app"
-	
+
 	@echo "Creating macOS application bundle with appify..."
-	
+
 	# Create universal binary
 	@echo "Creating universal binary..."
 	lipo -create out/$(APP_NAME)-darwin-amd64 out/$(APP_NAME)-darwin-arm64 \
 		-output out/$(APP_NAME)-universal
-	
+
 	# Copy logo to out directory
 	cp media/logo.png out/logo.png
-	
+
 	# Create menubar icon (small version with transparency)
 	@echo "Creating menubar icon..."
 	sips -z 44 44 media/logo.png --out out/menubar-icon.png
 	# Ensure the icon has an alpha channel
 	sips -s format png out/menubar-icon.png --out out/menubar-icon.png
-	
+
 	# Create app bundle with appify using universal binary
 	cd out && appify -name "$(BUNDLE_NAME)" \
 		-icon logo.png \
 		-id "$(BUNDLE_ID)" \
 		$(APP_NAME)-universal
-	
+
 	# Move the generated app to the expected location
 	@if [ -f "out/$(BUNDLE_NAME)-universal.app" ]; then \
 		mv "out/$(BUNDLE_NAME)-universal.app" "out/$(BUNDLE_NAME).app"; \
 	elif [ ! -d "out/$(BUNDLE_NAME).app" ]; then \
 		echo "Warning: App bundle not found in expected location"; \
 	fi
-	
+
 	# Copy menubar icon to Resources
 	@echo "Copying menubar icon to app bundle..."
 	cp out/menubar-icon.png "out/$(BUNDLE_NAME).app/Contents/Resources/menubar-icon.png"
-	
+
 	# Create English localization
 	@echo "Creating English localization..."
 	mkdir -p "out/$(BUNDLE_NAME).app/Contents/Resources/en.lproj"
-	
+
 	# Fix the executable name (appify adds .app suffix which we don't want)
 	@echo "Fixing executable name..."
 	@if [ -f "out/$(BUNDLE_NAME).app/Contents/MacOS/$(BUNDLE_NAME).app" ]; then \
 		mv "out/$(BUNDLE_NAME).app/Contents/MacOS/$(BUNDLE_NAME).app" "out/$(BUNDLE_NAME).app/Contents/MacOS/$(BUNDLE_NAME)"; \
 	fi
-	
+
 	# Fix the Info.plist
 	@echo "Fixing Info.plist..."
 	@/usr/libexec/PlistBuddy -c "Set :CFBundleExecutable Ready\\ to\\ Review" "out/$(BUNDLE_NAME).app/Contents/Info.plist"
@@ -130,14 +130,14 @@ app-bundle: out build-darwin install-appify
 		/usr/libexec/PlistBuddy -c "Set :CFBundleDevelopmentRegion en" "out/$(BUNDLE_NAME).app/Contents/Info.plist"
 	@/usr/libexec/PlistBuddy -c "Add :NSUserNotificationAlertStyle string alert" "out/$(BUNDLE_NAME).app/Contents/Info.plist" 2>/dev/null || \
 		/usr/libexec/PlistBuddy -c "Set :NSUserNotificationAlertStyle alert" "out/$(BUNDLE_NAME).app/Contents/Info.plist"
-	
+
 	# Remove extended attributes and code sign the app bundle
 	@echo "Preparing app bundle for signing..."
 	xattr -cr "out/$(BUNDLE_NAME).app"
-	
+
 	@echo "Code signing the app bundle..."
 	codesign --force --deep --sign - --options runtime "out/$(BUNDLE_NAME).app"
-	
+
 	@echo "macOS app bundle created: out/$(BUNDLE_NAME).app"
 
 # Install the application (detects OS automatically)

README.md

@@ -71,9 +71,10 @@ The Goose is part of the [codeGROOVE](https://codegroove.dev) developer accelera
 
 ## Privacy
 
-- Your GitHub token is never stored or logged
-- PR metadata cached for up to 20 days (performance)
-- No telemetry or external data collection
+- Your GitHub token is used to authenticate against GitHub and codeGROOVE's API for state-machine & natural-language processing
+- Your GitHub token is never stored or logged,
+- PR metadata may be locally or remotely cached for up to 20 days (performance)
+- No telemetry is collected
 
 ---
 

cmd/goose/github.go

@@ -621,15 +621,17 @@ func (app *App) fetchTurnDataAsync(ctx context.Context, issues []*github.Issue,
 		}
 	}
 
-	// Check for newly blocked PRs after Turn data is applied
-	app.checkForNewlyBlockedPRs(ctx)
+	// Only check for newly blocked PRs if there were actual changes
+	if actualChanges > 0 {
+		app.checkForNewlyBlockedPRs(ctx)
+	}
 
 	// Update tray title and menu with final Turn data if menu is already initialized
 	app.setTrayTitle()
 	if app.menuInitialized {
 		// Only trigger menu update if PR data actually changed
 		if actualChanges > 0 {
-			app.updateMenuIfChanged(ctx)
+			app.updateMenu(ctx)
 		}
 	}
 }