duplicate version architecture changes

Author: MattKiazyk

Sources/XcodesKit/Services/XcodeListPresentationService.swift

@@ -41,12 +41,13 @@ public struct XcodeListPresentationService: Sendable {
             )
             : availableXcodes)
             .matchingArchitectureFilters(architectures)
+        let visibleAvailableXcodes = XcodeListService.filteringPrereleasesWithDuplicateBuildMetadata(adjustedAvailableXcodes)
 
         let adjustedInstalledXcodes = architectures.isEmpty
             ? installedXcodes
             : installedXcodes.filter { architectures.matches($0.xcodeID.architectures) }
 
-        var releasedVersions = adjustedAvailableXcodes.map {
+        var releasedVersions = visibleAvailableXcodes.map {
             ReleasedVersion(version: $0.version, releaseDate: $0.releaseDate, architectures: $0.architectures)
         }
 

Sources/XcodesKit/Services/XcodeListService.swift

@@ -195,9 +195,14 @@ public struct XcodeListService: Sendable {
                 $0.version.buildMetadataIdentifiers == availableXcode.version.buildMetadataIdentifiers
             }
 
+            let releaseWithSameBuildAndArchitecture = availableXcodesWithIdenticalBuildIdentifiers.contains {
+                $0.version.prereleaseIdentifiers.isEmpty &&
+                    $0.architectures == availableXcode.architectures
+            }
+
             return availableXcodesWithIdenticalBuildIdentifiers.count == 1 ||
                 availableXcodesWithIdenticalBuildIdentifiers.count > 1 &&
-                (availableXcode.version.prereleaseIdentifiers.isEmpty || availableXcode.architectures?.isEmpty == false)
+                (availableXcode.version.prereleaseIdentifiers.isEmpty || !releaseWithSameBuildAndArchitecture)
         }
     }
 

Tests/XcodesKitTests/ArchitectureFilteringTests.swift

@@ -52,6 +52,24 @@ final class ArchitectureFilteringTests: XCTestCase {
         ])
     }
 
+    func testXcodeListPresentationServiceFiltersPrereleaseWithSameBuildAndArchitecture() throws {
+        let release = availableXcode("26.5.0+17F42", filename: "Xcode-26.5-arm64.xip", architectures: [.arm64])
+        let prerelease = availableXcode("26.5.0-Release.Candidate+17F42", filename: "Xcode-26.5-rc-arm64.xip", architectures: [.arm64])
+
+        let rows = XcodeListPresentationService().availableRows(
+            availableXcodes: [release, prerelease],
+            installedXcodes: [],
+            selectedXcodePath: nil,
+            dataSource: .xcodeReleases,
+            architectures: [.variant(.appleSilicon)]
+        )
+
+        XCTAssertEqual(rows.map(\.version), [release.version])
+        XCTAssertEqual(rows.map(\.versionDescription), [
+            "26.5 (17F42) [Apple Silicon]"
+        ])
+    }
+
     func testArchitectureFiltersParseRawArchitecturesAndVariants() {
         XCTAssertEqual(ArchitectureFilter("arm64"), .architecture(.arm64))
         XCTAssertEqual(ArchitectureFilter("x86_64"), .architecture(.x86_64))

Tests/XcodesKitTests/XcodesKitTests.swift

@@ -1076,7 +1076,7 @@ final class XcodesKitTests: XCTestCase {
         ])
     }
 
-    func testXcodeListServiceKeepsArchitectureSpecificPrereleaseWithDuplicateBuildMetadata() throws {
+    func testXcodeListServiceKeepsArchitectureSpecificPrereleaseWithDuplicateBuildMetadataWhenReleaseHasNoArchitecture() throws {
         let release = AvailableXcode(
             version: try XCTUnwrap(Version("16.0.0+16A1")),
             url: try XCTUnwrap(URL(string: "https://apple.com/xcode.xip")),
@@ -1102,6 +1102,32 @@ final class XcodesKitTests: XCTestCase {
         ])
     }
 
+    func testXcodeListServiceFiltersArchitectureSpecificPrereleaseWhenReleaseHasSameArchitecture() throws {
+        let release = AvailableXcode(
+            version: try XCTUnwrap(Version("26.5.0+17F42")),
+            url: try XCTUnwrap(URL(string: "https://apple.com/xcode-arm64.xip")),
+            filename: "mock-arm64.xip",
+            releaseDate: nil,
+            architectures: [.arm64]
+        )
+        let prerelease = AvailableXcode(
+            version: try XCTUnwrap(Version("26.5.0-Release.Candidate+17F42")),
+            url: try XCTUnwrap(URL(string: "https://apple.com/xcode-rc-arm64.xip")),
+            filename: "mock-rc-arm64.xip",
+            releaseDate: nil,
+            architectures: [.arm64]
+        )
+
+        let filtered = XcodeListService.filteringPrereleasesWithDuplicateBuildMetadata([
+            release,
+            prerelease
+        ])
+
+        XCTAssertEqual(filtered.map(\.xcodeID), [
+            release.xcodeID
+        ])
+    }
+
     func testXcodeListServiceFiltersIdenticalBuildsToMatchingArchitectureVariant() throws {
         let universalRelease = AvailableXcode(
             version: try XCTUnwrap(Version("26.5.0+17F42")),