chore(agents): fix version normalization for lockfiles

Author: rektdeckard

pkg/agentfs/sdk_version_check.go

@@ -660,7 +660,7 @@ func isVersionSatisfied(version, minVersion string, sourceType SourceType) (bool
 	case SourceTypeLock:
 		// For lock files, we have the exact version that was installed
 		// Check if this exact version is >= the minimum version
-		normalizedVersion := normalizeVersion(version)
+		normalizedVersion := normalizeVersion(version, sourceType)
 		v, err := semver.NewVersion(normalizedVersion)
 		if err != nil {
 			return false, fmt.Errorf("invalid version format: %s", version)
@@ -735,16 +735,22 @@ func isVersionSatisfied(version, minVersion string, sourceType SourceType) (bool
 	}
 }
 
-// normalizeVersion normalizes version strings for semver parsing
-func normalizeVersion(version string) string {
-	// Remove common prefixes and suffixes
+// normalizeVersion cleans up version strings for parsing
+func normalizeVersion(version string, sourceType SourceType) string {
+	// Remove whitespace and quotes
 	version = strings.TrimSpace(version)
-	version = strings.Trim(version, " \"'")
+	version = strings.Trim(version, `"'`)
 
-	// Handle npm version ranges (^ and ~ are npm-specific, not semver constraints)
-	if strings.HasPrefix(version, "^") || strings.HasPrefix(version, "~") {
-		version = version[1:]
+	// For lock files, we want the exact version, so remove npm-style prefixes
+	// For package files, we want to preserve the constraint operators
+	if sourceType == SourceTypeLock {
+		// Handle npm version ranges (^ and ~ are npm-specific, not semver constraints)
+		if strings.HasPrefix(version, "^") || strings.HasPrefix(version, "~") {
+			version = version[1:]
+		}
 	}
+	// For SourceTypePackage, we preserve all operators including ^ and ~
+	// as they are valid semver constraints that the semver library can parse
 
 	return version
 }

pkg/agentfs/sdk_version_check_test.go

@@ -251,25 +251,45 @@ func TestIsVersionSatisfied(t *testing.T) {
 
 func TestNormalizeVersion(t *testing.T) {
 	tests := []struct {
-		input    string
-		expected string
+		input       string
+		sourceType  SourceType
+		expected    string
+		description string
 	}{
-		{"1.5.0", "1.5.0"},
-		{"^1.5.0", "1.5.0"},
-		{"~1.5.0", "1.5.0"},
-		{">=1.5.0", ">=1.5.0"},
-		{"<2.0.0", "<2.0.0"},
-		{"==1.5.0", "==1.5.0"},
-		{" 1.5.0 ", "1.5.0"},
-		{`"1.5.0"`, "1.5.0"},
-		{`'1.5.0'`, "1.5.0"},
-		{"*", "*"},
-		{"latest", "latest"},
+		// Lock file tests (should remove ^ and ~)
+		{"1.5.0", SourceTypeLock, "1.5.0", "exact version"},
+		{"^1.5.0", SourceTypeLock, "1.5.0", "npm caret removed for lock file"},
+		{"~1.5.0", SourceTypeLock, "1.5.0", "npm tilde removed for lock file"},
+		{">=1.5.0", SourceTypeLock, ">=1.5.0", "semver operators preserved for lock file"},
+		{"<2.0.0", SourceTypeLock, "<2.0.0", "semver operators preserved for lock file"},
+		{"==1.5.0", SourceTypeLock, "==1.5.0", "semver operators preserved for lock file"},
+		{" 1.5.0 ", SourceTypeLock, "1.5.0", "whitespace removed"},
+		{`"1.5.0"`, SourceTypeLock, "1.5.0", "quotes removed"},
+		{`'1.5.0'`, SourceTypeLock, "1.5.0", "quotes removed"},
+		{"*", SourceTypeLock, "*", "wildcard preserved"},
+		{"latest", SourceTypeLock, "latest", "latest preserved"},
+		
+		// Package file tests (should preserve ^ and ~)
+		{"1.5.0", SourceTypePackage, "1.5.0", "exact version"},
+		{"^1.5.0", SourceTypePackage, "^1.5.0", "npm caret preserved for package file"},
+		{"~1.5.0", SourceTypePackage, "~1.5.0", "npm tilde preserved for package file"},
+		{">=1.5.0", SourceTypePackage, ">=1.5.0", "semver operators preserved for package file"},
+		{"<2.0.0", SourceTypePackage, "<2.0.0", "semver operators preserved for package file"},
+		{"==1.5.0", SourceTypePackage, "==1.5.0", "semver operators preserved for package file"},
+		{" 1.5.0 ", SourceTypePackage, "1.5.0", "whitespace removed"},
+		{`"1.5.0"`, SourceTypePackage, "1.5.0", "quotes removed"},
+		{`'1.5.0'`, SourceTypePackage, "1.5.0", "quotes removed"},
+		{"*", SourceTypePackage, "*", "wildcard preserved"},
+		{"latest", SourceTypePackage, "latest", "latest preserved"},
 	}
 
 	for _, tt := range tests {
-		t.Run(tt.input, func(t *testing.T) {
-			result := normalizeVersion(tt.input)
+		sourceTypeStr := "Package"
+		if tt.sourceType == SourceTypeLock {
+			sourceTypeStr = "Lock"
+		}
+		t.Run(fmt.Sprintf("%s_%s_%s", tt.input, sourceTypeStr, tt.description), func(t *testing.T) {
+			result := normalizeVersion(tt.input, tt.sourceType)
 			if result != tt.expected {
 				t.Errorf("Expected %s but got %s", tt.expected, result)
 			}