Merge pull request router-for-me#3877 from sususu98/feat/antigravity-cli-ua-upstream-dev

feat(misc): align Antigravity runtime UA with agy CLI version sources

Author: luispater

internal/misc/antigravity_version.go

@@ -7,6 +7,7 @@ import (
 	"encoding/xml"
 	"errors"
 	"fmt"
+	"io"
 	"net/http"
 	"strconv"
 	"strings"
@@ -17,28 +18,31 @@ import (
 )
 
 const (
-	antigravityFallbackVersion = "2.1.0"
+	antigravityFallbackVersion = "1.0.8"
+	antigravityCLIPlatform     = "darwin/arm64"
 	antigravityVersionCacheTTL = 6 * time.Hour
 	antigravityFetchTimeout    = 10 * time.Second
 	AntigravityNodeAPIClientUA = "google-api-nodejs-client/10.3.0"
 	AntigravityGoogAPIClientUA = "gl-node/22.21.1"
 )
 
 var (
-	antigravityHubGCSListURL = "https://storage.googleapis.com/antigravity-public/?prefix=antigravity-hub/&delimiter=/"
-	antigravityReleasesURL   = "https://antigravity-auto-updater-974169037036.us-central1.run.app/releases"
+	antigravityCLIUpdaterBaseURL = "https://antigravity-cli-auto-updater-974169037036.us-central1.run.app/manifests"
+	antigravityCLILatestURL      = "https://storage.googleapis.com/antigravity-public/antigravity-cli/latest"
+	antigravityCLIGCSListURL     = "https://storage.googleapis.com/antigravity-public/?prefix=antigravity-cli/&delimiter=/"
 )
 
-type antigravityRelease struct {
-	Version     string `json:"version"`
-	ExecutionID string `json:"execution_id"`
+type antigravityCLIUpdaterManifest struct {
+	Version string `json:"version"`
+	URL     string `json:"url"`
+	SHA512  string `json:"sha512"`
 }
 
-type antigravityHubGCSList struct {
-	CommonPrefixes []antigravityHubGCSPrefix `xml:"CommonPrefixes"`
+type antigravityGCSList struct {
+	CommonPrefixes []antigravityGCSPrefix `xml:"CommonPrefixes"`
 }
 
-type antigravityHubGCSPrefix struct {
+type antigravityGCSPrefix struct {
 	Prefix string `xml:"Prefix"`
 }
 
@@ -123,10 +127,13 @@ func AntigravityLatestVersion() string {
 	return antigravityFallbackVersion
 }
 
-// AntigravityUserAgent returns the User-Agent string for antigravity requests
-// using the latest version fetched from the releases API.
+// AntigravityUserAgent returns the User-Agent string used by the agy CLI family.
 func AntigravityUserAgent() string {
-	return fmt.Sprintf("antigravity/%s darwin/arm64", AntigravityLatestVersion())
+	return fmt.Sprintf("antigravity/cli/%s %s", AntigravityLatestVersion(), antigravityCLIPlatform)
+}
+
+func isAntigravityFamilyUserAgent(lower string) bool {
+	return strings.HasPrefix(lower, "antigravity/cli/") || strings.HasPrefix(lower, "antigravity/")
 }
 
 func antigravityBaseUserAgent(userAgent string) string {
@@ -135,7 +142,7 @@ func antigravityBaseUserAgent(userAgent string) string {
 		return AntigravityUserAgent()
 	}
 	lower := strings.ToLower(userAgent)
-	if strings.HasPrefix(lower, "antigravity/") {
+	if isAntigravityFamilyUserAgent(lower) {
 		if idx := strings.Index(lower, " google-api-nodejs-client/"); idx >= 0 {
 			trimmed := strings.TrimSpace(userAgent[:idx])
 			if trimmed != "" {
@@ -160,7 +167,7 @@ func AntigravityLoadCodeAssistUserAgent(userAgent string) string {
 		return AntigravityUserAgent() + " " + AntigravityNodeAPIClientUA
 	}
 	lower := strings.ToLower(userAgent)
-	if !strings.HasPrefix(lower, "antigravity/") {
+	if !isAntigravityFamilyUserAgent(lower) {
 		return userAgent
 	}
 	if strings.Contains(lower, "google-api-nodejs-client/") {
@@ -174,10 +181,24 @@ func AntigravityLoadCodeAssistUserAgent(userAgent string) string {
 func AntigravityVersionFromUserAgent(userAgent string) string {
 	base := antigravityBaseUserAgent(userAgent)
 	lower := strings.ToLower(base)
-	if !strings.HasPrefix(lower, "antigravity/") {
+	for _, familyPrefix := range []string{"antigravity/cli/", "antigravity/hub/"} {
+		if strings.HasPrefix(lower, familyPrefix) {
+			rest := base[len(familyPrefix):]
+			if idx := strings.IndexAny(rest, " \t"); idx >= 0 {
+				rest = rest[:idx]
+			}
+			rest = strings.TrimSpace(rest)
+			if rest == "" {
+				return AntigravityLatestVersion()
+			}
+			return rest
+		}
+	}
+	const legacyPrefix = "antigravity/"
+	if !strings.HasPrefix(lower, legacyPrefix) {
 		return AntigravityLatestVersion()
 	}
-	rest := base[len("antigravity/"):]
+	rest := base[len(legacyPrefix):]
 	if idx := strings.IndexAny(rest, " \t"); idx >= 0 {
 		rest = rest[:idx]
 	}
@@ -188,104 +209,154 @@ func AntigravityVersionFromUserAgent(userAgent string) string {
 	return rest
 }
 
+func antigravityCLIUpdaterManifestName() string {
+	return strings.ReplaceAll(antigravityCLIPlatform, "/", "_")
+}
+
 func fetchAntigravityLatestVersion(ctx context.Context) (string, error) {
 	if ctx == nil {
 		ctx = context.Background()
 	}
 
 	client := &http.Client{Timeout: antigravityFetchTimeout}
 
-	version, errHub := fetchAntigravityHubGCSLatestVersion(ctx, client)
-	if errHub == nil {
+	version, errManifest := fetchAntigravityCLIUpdaterManifestVersion(ctx, client)
+	if errManifest == nil {
 		return version, nil
 	}
 
-	log.WithError(errHub).Debug("failed to fetch antigravity hub GCS version, trying legacy releases API")
+	log.WithError(errManifest).Debug("failed to fetch antigravity CLI updater manifest, trying CLI latest pointer")
 
-	version, errLegacy := fetchAntigravityLegacyLatestVersion(ctx, client)
-	if errLegacy == nil {
+	version, errLatest := fetchAntigravityCLILatestVersion(ctx, client)
+	if errLatest == nil {
 		return version, nil
 	}
 
-	return "", fmt.Errorf("fetch antigravity hub GCS version: %v; fetch legacy releases: %w", errHub, errLegacy)
+	log.WithError(errLatest).Debug("failed to fetch antigravity CLI latest version, trying CLI GCS prefix list")
+
+	version, errList := fetchAntigravityCLIGCSLatestVersion(ctx, client)
+	if errList == nil {
+		return version, nil
+	}
+
+	return "", fmt.Errorf("fetch antigravity CLI updater manifest: %v; fetch antigravity CLI latest: %v; fetch antigravity CLI GCS version: %w", errManifest, errLatest, errList)
 }
 
-func fetchAntigravityHubGCSLatestVersion(ctx context.Context, client *http.Client) (string, error) {
-	httpReq, errReq := http.NewRequestWithContext(ctx, http.MethodGet, antigravityHubGCSListURL, nil)
+func fetchAntigravityCLIUpdaterManifestVersion(ctx context.Context, client *http.Client) (string, error) {
+	manifestURL := fmt.Sprintf("%s/%s.json", strings.TrimSuffix(antigravityCLIUpdaterBaseURL, "/"), antigravityCLIUpdaterManifestName())
+	httpReq, errReq := http.NewRequestWithContext(ctx, http.MethodGet, manifestURL, nil)
 	if errReq != nil {
-		return "", fmt.Errorf("build antigravity hub GCS request: %w", errReq)
+		return "", fmt.Errorf("build antigravity CLI updater manifest request: %w", errReq)
 	}
 
 	resp, errDo := client.Do(httpReq)
 	if errDo != nil {
-		return "", fmt.Errorf("fetch antigravity hub GCS list: %w", errDo)
+		return "", fmt.Errorf("fetch antigravity CLI updater manifest: %w", errDo)
 	}
 	defer func() {
 		if errClose := resp.Body.Close(); errClose != nil {
-			log.WithError(errClose).Warn("antigravity hub GCS response body close error")
+			log.WithError(errClose).Warn("antigravity CLI updater manifest response body close error")
 		}
 	}()
 
 	if resp.StatusCode != http.StatusOK {
-		return "", fmt.Errorf("antigravity hub GCS list returned status %d", resp.StatusCode)
+		return "", fmt.Errorf("antigravity CLI updater manifest returned status %d", resp.StatusCode)
 	}
 
-	var list antigravityHubGCSList
-	if errDecode := xml.NewDecoder(resp.Body).Decode(&list); errDecode != nil {
-		return "", fmt.Errorf("decode antigravity hub GCS list: %w", errDecode)
+	raw, errRead := io.ReadAll(io.LimitReader(resp.Body, 4096))
+	if errRead != nil {
+		return "", fmt.Errorf("read antigravity CLI updater manifest: %w", errRead)
 	}
 
-	prefixes := make([]string, 0, len(list.CommonPrefixes))
-	for _, commonPrefix := range list.CommonPrefixes {
-		prefixes = append(prefixes, commonPrefix.Prefix)
+	var manifest antigravityCLIUpdaterManifest
+	if errDecode := json.Unmarshal(raw, &manifest); errDecode != nil {
+		return "", fmt.Errorf("decode antigravity CLI updater manifest: %w", errDecode)
 	}
 
-	return latestAntigravityHubVersionFromPrefixes(prefixes)
+	version := strings.TrimSpace(manifest.Version)
+	if version == "" {
+		return "", errors.New("antigravity CLI updater manifest returned empty version")
+	}
+	if _, ok := parseAntigravitySemVersion(version); !ok {
+		return "", fmt.Errorf("antigravity CLI updater manifest returned invalid version %q", version)
+	}
+	return version, nil
 }
 
-func fetchAntigravityLegacyLatestVersion(ctx context.Context, client *http.Client) (string, error) {
-	httpReq, errReq := http.NewRequestWithContext(ctx, http.MethodGet, antigravityReleasesURL, nil)
+func fetchAntigravityCLILatestVersion(ctx context.Context, client *http.Client) (string, error) {
+	httpReq, errReq := http.NewRequestWithContext(ctx, http.MethodGet, antigravityCLILatestURL, nil)
 	if errReq != nil {
-		return "", fmt.Errorf("build antigravity releases request: %w", errReq)
+		return "", fmt.Errorf("build antigravity CLI latest request: %w", errReq)
 	}
 
 	resp, errDo := client.Do(httpReq)
 	if errDo != nil {
-		return "", fmt.Errorf("fetch antigravity releases: %w", errDo)
+		return "", fmt.Errorf("fetch antigravity CLI latest: %w", errDo)
 	}
 	defer func() {
 		if errClose := resp.Body.Close(); errClose != nil {
-			log.WithError(errClose).Warn("antigravity releases response body close error")
+			log.WithError(errClose).Warn("antigravity CLI latest response body close error")
 		}
 	}()
 
 	if resp.StatusCode != http.StatusOK {
-		return "", fmt.Errorf("antigravity releases API returned status %d", resp.StatusCode)
+		return "", fmt.Errorf("antigravity CLI latest returned status %d", resp.StatusCode)
 	}
 
-	var releases []antigravityRelease
-	if errDecode := json.NewDecoder(resp.Body).Decode(&releases); errDecode != nil {
-		return "", fmt.Errorf("decode antigravity releases response: %w", errDecode)
+	raw, errRead := io.ReadAll(io.LimitReader(resp.Body, 256))
+	if errRead != nil {
+		return "", fmt.Errorf("read antigravity CLI latest: %w", errRead)
+	}
+	version := strings.TrimSpace(string(raw))
+	if version == "" {
+		return "", errors.New("antigravity CLI latest returned empty version")
+	}
+	semVersion, ok := parseAntigravitySemVersion(version)
+	if !ok {
+		return "", fmt.Errorf("antigravity CLI latest returned invalid version %q", version)
 	}
+	return semVersion.raw, nil
+}
 
-	if len(releases) == 0 {
-		return "", errors.New("antigravity releases API returned empty list")
+func fetchAntigravityCLIGCSLatestVersion(ctx context.Context, client *http.Client) (string, error) {
+	httpReq, errReq := http.NewRequestWithContext(ctx, http.MethodGet, antigravityCLIGCSListURL, nil)
+	if errReq != nil {
+		return "", fmt.Errorf("build antigravity CLI GCS request: %w", errReq)
 	}
 
-	version := releases[0].Version
-	if version == "" {
-		return "", errors.New("antigravity releases API returned empty version")
+	resp, errDo := client.Do(httpReq)
+	if errDo != nil {
+		return "", fmt.Errorf("fetch antigravity CLI GCS list: %w", errDo)
 	}
+	defer func() {
+		if errClose := resp.Body.Close(); errClose != nil {
+			log.WithError(errClose).Warn("antigravity CLI GCS response body close error")
+		}
+	}()
 
-	return version, nil
+	if resp.StatusCode != http.StatusOK {
+		return "", fmt.Errorf("antigravity CLI GCS list returned status %d", resp.StatusCode)
+	}
+
+	var list antigravityGCSList
+	if errDecode := xml.NewDecoder(resp.Body).Decode(&list); errDecode != nil {
+		return "", fmt.Errorf("decode antigravity CLI GCS list: %w", errDecode)
+	}
+
+	prefixes := make([]string, 0, len(list.CommonPrefixes))
+	for _, commonPrefix := range list.CommonPrefixes {
+		prefixes = append(prefixes, commonPrefix.Prefix)
+	}
+
+	return latestAntigravityCLIVersionFromPrefixes(prefixes)
 }
 
-func latestAntigravityHubVersionFromPrefixes(prefixes []string) (string, error) {
+func latestAntigravityCLIVersionFromPrefixes(prefixes []string) (string, error) {
 	var best antigravitySemVersion
 	found := false
 
 	for _, prefix := range prefixes {
-		version, ok := antigravityHubVersionFromPrefix(prefix)
+		version, ok := antigravityCLIVersionFromPrefix(prefix)
 		if !ok {
 			continue
 		}
@@ -300,38 +371,52 @@ func latestAntigravityHubVersionFromPrefixes(prefixes []string) (string, error)
 	}
 
 	if !found {
-		return "", errors.New("antigravity hub GCS list contained no version prefixes")
+		return "", errors.New("antigravity-cli GCS list contained no version prefixes")
 	}
 
 	return best.raw, nil
 }
 
-func antigravityHubVersionFromPrefix(prefix string) (string, bool) {
-	const hubPrefix = "antigravity-hub/"
-
+func antigravityCLIVersionFromPrefix(prefix string) (string, bool) {
+	const cliPrefix = "antigravity-cli/"
 	prefix = strings.TrimSpace(prefix)
 	prefix = strings.TrimSuffix(prefix, "/")
-	if !strings.HasPrefix(prefix, hubPrefix) {
+	if !strings.HasPrefix(prefix, cliPrefix) {
 		return "", false
 	}
 
-	name := strings.TrimPrefix(prefix, hubPrefix)
-	separator := strings.LastIndex(name, "-")
-	if separator <= 0 || separator == len(name)-1 {
+	name := strings.TrimPrefix(prefix, cliPrefix)
+	if name == "latest" || name == "test" || name == "tools" || strings.HasPrefix(name, "v") {
 		return "", false
 	}
 
-	version := strings.TrimSpace(name[:separator])
-	executionID := name[separator+1:]
-	if version == "" || executionID == "" {
-		return "", false
-	}
-	for _, ch := range executionID {
-		if ch < '0' || ch > '9' {
-			return "", false
+	separator := strings.LastIndex(name, "-")
+	if separator > 0 && separator < len(name)-1 {
+		version := strings.TrimSpace(name[:separator])
+		executionID := name[separator+1:]
+		if version != "" && executionID != "" {
+			allDigits := true
+			for _, ch := range executionID {
+				if ch < '0' || ch > '9' {
+					allDigits = false
+					break
+				}
+			}
+			if allDigits {
+				if _, ok := parseAntigravitySemVersion(version); ok {
+					return version, true
+				}
+			}
 		}
 	}
 
+	version := strings.TrimSpace(name)
+	if version == "" {
+		return "", false
+	}
+	if _, ok := parseAntigravitySemVersion(version); !ok {
+		return "", false
+	}
 	return version, true
 }