Merge origin/main into feat/issue-auto-implement-setup; keep workflow fix (no workflows: write)

Made-with: Cursor

Author: leggetter

pkg/version/version.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strconv"
 	"strings"
 
 	"github.com/google/go-github/v28/github"
@@ -37,8 +38,113 @@ func CheckLatestVersion() {
 	}
 }
 
-func needsToUpgrade(version, latest string) bool {
-	return latest != "" && (strings.TrimPrefix(latest, "v") != strings.TrimPrefix(version, "v"))
+func needsToUpgrade(current, latest string) bool {
+	if latest == "" {
+		return false
+	}
+
+	current = strings.TrimPrefix(current, "v")
+	latest = strings.TrimPrefix(latest, "v")
+
+	currentIsPreRelease := strings.Contains(current, "-")
+	latestIsPreRelease := strings.Contains(latest, "-")
+
+	// Don't suggest upgrading from a GA release to a pre-release version.
+	if !currentIsPreRelease && latestIsPreRelease {
+		return false
+	}
+
+	return semverGreater(latest, current)
+}
+
+// semverGreater returns true if a is semantically greater than b.
+// Both a and b must not have a "v" prefix.
+func semverGreater(a, b string) bool {
+	aNums, aPre := parseVersion(a)
+	bNums, bPre := parseVersion(b)
+
+	maxLen := len(aNums)
+	if len(bNums) > maxLen {
+		maxLen = len(bNums)
+	}
+	for i := 0; i < maxLen; i++ {
+		var av, bv int
+		if i < len(aNums) {
+			av = aNums[i]
+		}
+		if i < len(bNums) {
+			bv = bNums[i]
+		}
+		if av != bv {
+			return av > bv
+		}
+	}
+
+	// Same base version: GA (no pre-release) beats any pre-release.
+	if aPre == "" && bPre != "" {
+		return true
+	}
+	if aPre != "" && bPre == "" {
+		return false
+	}
+
+	return comparePreRelease(aPre, bPre) > 0
+}
+
+// parseVersion splits a version string (without "v" prefix) into its
+// numeric components and an optional pre-release identifier.
+func parseVersion(v string) (nums []int, pre string) {
+	parts := strings.SplitN(v, "-", 2)
+	if len(parts) > 1 {
+		pre = parts[1]
+	}
+	for _, s := range strings.Split(parts[0], ".") {
+		n, _ := strconv.Atoi(s)
+		nums = append(nums, n)
+	}
+	return
+}
+
+// comparePreRelease compares two pre-release strings dot-by-dot.
+// Returns a positive value if a > b, zero if equal, negative if a < b.
+func comparePreRelease(a, b string) int {
+	if a == b {
+		return 0
+	}
+	aParts := strings.Split(a, ".")
+	bParts := strings.Split(b, ".")
+
+	maxLen := len(aParts)
+	if len(bParts) > maxLen {
+		maxLen = len(bParts)
+	}
+
+	for i := 0; i < maxLen; i++ {
+		if i >= len(aParts) {
+			return -1
+		}
+		if i >= len(bParts) {
+			return 1
+		}
+		aN, aErr := strconv.Atoi(aParts[i])
+		bN, bErr := strconv.Atoi(bParts[i])
+		if aErr == nil && bErr == nil {
+			if aN != bN {
+				if aN > bN {
+					return 1
+				}
+				return -1
+			}
+		} else {
+			if aParts[i] > bParts[i] {
+				return 1
+			}
+			if aParts[i] < bParts[i] {
+				return -1
+			}
+		}
+	}
+	return 0
 }
 
 func getLatestVersion() string {

pkg/version/version_test.go

@@ -7,9 +7,39 @@ import (
 )
 
 func TestNeedsToUpgrade(t *testing.T) {
+	// Basic same-version checks (v-prefix normalisation).
 	require.False(t, needsToUpgrade("4.2.4.2", "v4.2.4.2"))
 	require.False(t, needsToUpgrade("4.2.4.2", "4.2.4.2"))
+
+	// GA to newer GA — should upgrade.
 	require.True(t, needsToUpgrade("4.2.4.2", "4.2.4.3"))
 	require.True(t, needsToUpgrade("4.2.4.2", "v4.2.4.3"))
 	require.True(t, needsToUpgrade("v4.2.4.2", "v4.2.4.3"))
+
+	// Minor/major version bump where numeric comparison matters
+	// (string comparison would wrongly treat 1.9.x > 1.10.x).
+	require.True(t, needsToUpgrade("1.9.1", "1.10.0"))
+	require.False(t, needsToUpgrade("1.10.0", "1.9.1"))
+
+	// GA current, pre-release latest — must NOT suggest upgrade.
+	require.False(t, needsToUpgrade("1.9.1", "1.10.0-beta.4"))
+	require.False(t, needsToUpgrade("1.9.1", "v1.10.0-beta.4"))
+	require.False(t, needsToUpgrade("1.10.0", "1.10.1-beta.1"))
+
+	// Pre-release current, newer GA latest — should upgrade.
+	require.True(t, needsToUpgrade("1.9.0-beta.4", "1.9.0"))
+	require.True(t, needsToUpgrade("1.10.0-beta.4", "1.10.0"))
+
+	// Pre-release current, older GA latest — should NOT upgrade.
+	require.False(t, needsToUpgrade("1.10.0-beta.4", "1.9.1"))
+
+	// Pre-release to newer pre-release — should upgrade.
+	require.True(t, needsToUpgrade("1.9.0-beta.3", "1.9.0-beta.4"))
+	require.True(t, needsToUpgrade("1.9.0-beta.9", "1.9.0-beta.10"))
+
+	// Pre-release to older pre-release — should NOT upgrade.
+	require.False(t, needsToUpgrade("1.9.0-beta.4", "1.9.0-beta.3"))
+
+	// Same pre-release — should NOT upgrade.
+	require.False(t, needsToUpgrade("1.9.0-beta.4", "1.9.0-beta.4"))
 }