Use semver-based selection and add repo context to error in resolveLatestRelease

Copilot · pelikhan · web-flow · commit 76345a671592 · 2026-04-01T03:15:46.000Z
Agent-Logs-Url: https://github.com/github/gh-aw/sessions/99b19872-48e9-42c7-a1b6-2798045efd66 Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>
diff --git a/pkg/cli/update_workflows.go b/pkg/cli/update_workflows.go
@@ -305,18 +305,31 @@ func resolveLatestRelease(repo, currentRef string, allowMajor, verbose bool) (st
 	// Parse current version
 	currentVer := parseVersion(currentRef)
 	if currentVer == nil {
-		// If current version is not a valid semantic version, return the latest stable release
+		// If current version is not a valid semantic version, select the latest stable release
+		// by semantic version so we are not sensitive to the ordering of the API response.
+		var latestStable string
+		var latestStableVersion *semverutil.SemanticVersion
+
 		for _, release := range releases {
 			releaseVer := parseVersion(release)
 			if releaseVer == nil || releaseVer.Pre != "" {
 				continue
 			}
-			if verbose {
-				fmt.Fprintln(os.Stderr, console.FormatInfoMessage("Current version is not valid, using latest release: "+release))
+			if latestStableVersion == nil || releaseVer.IsNewer(latestStableVersion) {
+				latestStable = release
+				latestStableVersion = releaseVer
 			}
-			return release, nil
 		}
-		return "", errors.New("no stable releases found")
+
+		if latestStable == "" {
+			return "", fmt.Errorf("no stable releases found for %s", repo)
+		}
+
+		if verbose {
+			fmt.Fprintln(os.Stderr, console.FormatInfoMessage("Current version is not valid, using latest stable release: "+latestStable))
+		}
+
+		return latestStable, nil
 	}
 
 	// Find the latest compatible non-prerelease release.
diff --git a/pkg/cli/update_workflows_test.go b/pkg/cli/update_workflows_test.go
@@ -32,17 +32,18 @@ func TestResolveLatestRelease_PrereleaseTagsSkipped(t *testing.T) {
 }
 
 // TestResolveLatestRelease_PrereleaseSkippedWhenCurrentVersionInvalid verifies that when
-// the current version is not a valid semantic version, the first stable (non-prerelease)
-// release is returned rather than the first item in the list which could be a prerelease.
+// the current version is not a valid semantic version, the highest stable release by
+// semver is returned rather than the first item in the list (which could be a prerelease
+// or an older release listed first by the API).
 func TestResolveLatestRelease_PrereleaseSkippedWhenCurrentVersionInvalid(t *testing.T) {
 	mockWorkflowReleasesAPI(t, func(_ string) ([]byte, error) {
-		// Prerelease appears first in the list returned by the API.
-		return []byte("v2.0.0-rc.1\nv1.5.0"), nil
+		// Prerelease appears first, and older stable release appears before newer one.
+		return []byte("v2.0.0-rc.1\nv1.3.0\nv1.5.0"), nil
 	})
 
 	result, err := resolveLatestRelease("owner/repo", "not-a-version", true, false)
 	require.NoError(t, err, "should not error when stable release exists")
-	assert.Equal(t, "v1.5.0", result, "should skip prerelease and return first stable release")
+	assert.Equal(t, "v1.5.0", result, "should skip prerelease and return highest stable release by semver")
 }
 
 // TestResolveLatestRelease_ErrorWhenOnlyPrereleasesExist verifies that an error is
