feat: improve development kernel handling and chip display (#4)

p-linnane · claude · web-flow · commit 7f0fd5e33b2e · 2026-03-11T10:51:16.000-07:00
* feat: improve development kernel handling and chip display

- Resolve device mappings for development kernelcaches by normalizing
  filenames to release equivalents for board codename lookup
- Set chip to "Multiple" when a kernel spans multiple chip families
  instead of showing "Unknown"
- Show resolved chip names in kernel cards (sorted by generation/tier)
  with "Development" badge
- Deduplicate devices in Hardware Support when they appear in both
  release and development kernels
- Add opaque background to sidebar "Show pre-releases" toggle
- Rescan macOS 12.3 and 12.3.1 with updated scanner

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;

* fix: resolve swiftlint violations and CI scheme discovery

- Extract KernelCard view and sortedChipNames computed property to
  reduce closure/function body lengths in ReleaseDetailView
- Condense IPSWScanner comment to stay within type body length limit
- Add -workspace . to CI xcodebuild commands so macOSdb-Package scheme
  is discoverable

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;

* ci: remove unused SPM cache steps

xcodebuild with -workspace uses DerivedData, not .build, so the SPM
cache was never populated and produced path validation warnings.

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;

---------

Co-authored-by: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,17 +30,10 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Cache SPM packages
-        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
-        with:
-          path: .build
-          key: spm-${{ runner.os }}-${{ hashFiles('Package.resolved') }}
-          restore-keys: |
-            spm-${{ runner.os }}-
-
       - name: Test with Thread Sanitizer
         run: |
           xcodebuild test \
+            -workspace . \
             -scheme macOSdb-Package \
             -destination 'platform=macOS' \
             -enableCodeCoverage YES \
@@ -73,17 +66,10 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Cache SPM packages
-        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
-        with:
-          path: .build
-          key: spm-${{ runner.os }}-${{ hashFiles('Package.resolved') }}
-          restore-keys: |
-            spm-${{ runner.os }}-
-
       - name: Test with Address Sanitizer
         run: |
           xcodebuild test \
+            -workspace . \
             -scheme macOSdb-Package \
             -destination 'platform=macOS' \
             -enableAddressSanitizer YES \
diff --git a/Sources/macOSdbKit/Models/KernelInfo.swift b/Sources/macOSdbKit/Models/KernelInfo.swift
@@ -49,6 +49,30 @@ public struct KernelInfo: Codable, Identifiable, Hashable, Sendable {
         self.deviceChips = deviceChips
     }
 
+    public var isDevelopment: Bool {
+        file.contains("kernelcache.development.")
+    }
+
+    /// Unique chip names from `deviceChips`, sorted by generation then tier
+    /// (generation 0 sorts last). Falls back to the kernel-level `chip`.
+    public var sortedChipNames: [String] {
+        guard let deviceChips, !deviceChips.isEmpty else { return [chip] }
+        return deviceChips
+            .reduce(into: [String]()) { result, dc in
+                if !result.contains(dc.chip) { result.append(dc.chip) }
+            }
+            .sorted { lhs, rhs in
+                let lhsChip = ChipFamily.from(chipName: lhs)
+                let rhsChip = ChipFamily.from(chipName: rhs)
+                let lhsGen = lhsChip?.generation ?? 0
+                let rhsGen = rhsChip?.generation ?? 0
+                let lhsSortGen = lhsGen == 0 ? Int.max : lhsGen
+                let rhsSortGen = rhsGen == 0 ? Int.max : rhsGen
+                if lhsSortGen != rhsSortGen { return lhsSortGen < rhsSortGen }
+                return (lhsChip?.tier ?? .base) < (rhsChip?.tier ?? .base)
+            }
+    }
+
     public var chipFamily: ChipFamily? {
         ChipFamily.from(chipName: chip)
     }
diff --git a/Sources/macOSdbKit/Scanner/IPSWScanner.swift b/Sources/macOSdbKit/Scanner/IPSWScanner.swift
@@ -105,9 +105,10 @@ public actor IPSWScanner {
         for path in kernelcaches {
             guard var kernel = KernelParser.parse(kernelcachePath: path) else { continue }
             if kernel.devices.isEmpty {
-                // Try BuildManifest device map first, then fall back to hardcoded board codename map
+                // Try BuildManifest device map, then board codename map (normalizing dev → release)
+                let releaseKey = kernel.file.replacingOccurrences(of: ".development.", with: ".release.")
                 let devices = deviceMap[kernel.file]
-                    ?? boardCodeNameDevices[kernel.file]
+                    ?? boardCodeNameDevices[kernel.file] ?? boardCodeNameDevices[releaseKey]
                 if let devices {
                     kernel = KernelInfo(
                         file: kernel.file,
@@ -130,12 +131,19 @@ public actor IPSWScanner {
             return DeviceChip(device: device, chip: chip.displayName)
         }
         guard !deviceChips.isEmpty else { return kernel }
+        let resolvedChip: String
+        if kernel.chip == "Unknown" {
+            let uniqueChips = Set(deviceChips.map(\.chip))
+            resolvedChip = uniqueChips.count == 1 ? uniqueChips.first! : "Multiple"
+        } else {
+            resolvedChip = kernel.chip
+        }
         return KernelInfo(
             file: kernel.file,
             darwinVersion: kernel.darwinVersion,
             xnuVersion: kernel.xnuVersion,
             arch: kernel.arch,
-            chip: kernel.chip,
+            chip: resolvedChip,
             devices: kernel.devices,
             deviceChips: deviceChips
         )
diff --git a/Sources/macOSdbKit/Scanner/KernelParser.swift b/Sources/macOSdbKit/Scanner/KernelParser.swift
@@ -114,11 +114,15 @@ public enum KernelParser {
     /// - `kernelcache.release.Mac16,1_2_3_10_12_13` → `["Mac16,1", "Mac16,2", ...]`
     /// - `kernelcache.release.MacBookAir10,1_MacBookPro17,1` → `["MacBookAir10,1", "MacBookPro17,1"]`
     /// - `kernelcache.release.VirtualMac2,1` → `["VirtualMac2,1"]`
+    /// - `kernelcache.development.Mac16,1_2_3` → `["Mac16,1", "Mac16,2", "Mac16,3"]`
     /// - `kernelcache.release.mac13g` → `[]` (board codename, not device model IDs)
     public static func parseDevicesFromFilename(_ filename: String) -> [String] {
         var suffix = filename
-        if let range = suffix.range(of: "kernelcache.release.") {
-            suffix = String(suffix[range.upperBound...])
+        for prefix in ["kernelcache.release.", "kernelcache.development."] {
+            if let range = suffix.range(of: prefix) {
+                suffix = String(suffix[range.upperBound...])
+                break
+            }
         }
 
         // Handle VirtualMac specially
diff --git a/Tests/macOSdbKitTests/ScannerTests.swift b/Tests/macOSdbKitTests/ScannerTests.swift
@@ -170,6 +170,22 @@ struct KernelParserTests {
         )
         #expect(devices.isEmpty)
     }
+
+    @Test("Parse device models from development kernelcache")
+    func parseDevelopmentKernelcache() {
+        let devices = KernelParser.parseDevicesFromFilename(
+            "kernelcache.development.Mac16,1_2_3"
+        )
+        #expect(devices == ["Mac16,1", "Mac16,2", "Mac16,3"])
+    }
+
+    @Test("Development board codename returns empty devices")
+    func parseDevelopmentBoardCodename() {
+        let devices = KernelParser.parseDevicesFromFilename(
+            "kernelcache.development.mac13g"
+        )
+        #expect(devices.isEmpty)
+    }
 }
 
 @Suite("Scanner config tests")
diff --git a/data/releases/12/macOS-12.3-21E230.json b/data/releases/12/macOS-12.3-21E230.json
@@ -110,10 +110,71 @@
   "kernels" : [
     {
       "arch" : "ARM64",
-      "chip" : "Unknown",
+      "chip" : "Multiple",
       "darwinVersion" : "21.4.0",
+      "deviceChips" : [
+        {
+          "chip" : "M1",
+          "device" : "MacBookAir10,1"
+        },
+        {
+          "chip" : "M1",
+          "device" : "MacBookPro17,1"
+        },
+        {
+          "chip" : "M1",
+          "device" : "Macmini9,1"
+        },
+        {
+          "chip" : "M1",
+          "device" : "iMac21,1"
+        },
+        {
+          "chip" : "M1",
+          "device" : "iMac21,2"
+        },
+        {
+          "chip" : "M1 Max",
+          "device" : "Mac13,1"
+        },
+        {
+          "chip" : "M1 Ultra",
+          "device" : "Mac13,2"
+        },
+        {
+          "chip" : "M1 Pro",
+          "device" : "MacBookPro18,1"
+        },
+        {
+          "chip" : "M1 Max",
+          "device" : "MacBookPro18,2"
+        },
+        {
+          "chip" : "M1 Pro",
+          "device" : "MacBookPro18,3"
+        },
+        {
+          "chip" : "M1 Max",
+          "device" : "MacBookPro18,4"
+        },
+        {
+          "chip" : "Virtual Mac",
+          "device" : "VirtualMac2,1"
+        }
+      ],
       "devices" : [
-
+        "MacBookAir10,1",
+        "MacBookPro17,1",
+        "Macmini9,1",
+        "iMac21,1",
+        "iMac21,2",
+        "Mac13,1",
+        "Mac13,2",
+        "MacBookPro18,1",
+        "MacBookPro18,2",
+        "MacBookPro18,3",
+        "MacBookPro18,4",
+        "VirtualMac2,1"
       ],
       "file" : "kernelcache.development.mac13g",
       "xnuVersion" : "8020.101.4"
diff --git a/data/releases/12/macOS-12.3.1-21E258.json b/data/releases/12/macOS-12.3.1-21E258.json
@@ -110,10 +110,71 @@
   "kernels" : [
     {
       "arch" : "ARM64",
-      "chip" : "Unknown",
+      "chip" : "Multiple",
       "darwinVersion" : "21.4.0",
+      "deviceChips" : [
+        {
+          "chip" : "M1",
+          "device" : "MacBookAir10,1"
+        },
+        {
+          "chip" : "M1",
+          "device" : "MacBookPro17,1"
+        },
+        {
+          "chip" : "M1",
+          "device" : "Macmini9,1"
+        },
+        {
+          "chip" : "M1",
+          "device" : "iMac21,1"
+        },
+        {
+          "chip" : "M1",
+          "device" : "iMac21,2"
+        },
+        {
+          "chip" : "M1 Max",
+          "device" : "Mac13,1"
+        },
+        {
+          "chip" : "M1 Ultra",
+          "device" : "Mac13,2"
+        },
+        {
+          "chip" : "M1 Pro",
+          "device" : "MacBookPro18,1"
+        },
+        {
+          "chip" : "M1 Max",
+          "device" : "MacBookPro18,2"
+        },
+        {
+          "chip" : "M1 Pro",
+          "device" : "MacBookPro18,3"
+        },
+        {
+          "chip" : "M1 Max",
+          "device" : "MacBookPro18,4"
+        },
+        {
+          "chip" : "Virtual Mac",
+          "device" : "VirtualMac2,1"
+        }
+      ],
       "devices" : [
-
+        "MacBookAir10,1",
+        "MacBookPro17,1",
+        "Macmini9,1",
+        "iMac21,1",
+        "iMac21,2",
+        "Mac13,1",
+        "Mac13,2",
+        "MacBookPro18,1",
+        "MacBookPro18,2",
+        "MacBookPro18,3",
+        "MacBookPro18,4",
+        "VirtualMac2,1"
       ],
       "file" : "kernelcache.development.mac13g",
       "xnuVersion" : "8020.101.4"
diff --git a/macOSdbApp/Views/ChipSupportView.swift b/macOSdbApp/Views/ChipSupportView.swift
@@ -78,7 +78,9 @@ struct ChipSupportView: View {
                 for dc in deviceChips {
                     guard let chip = ChipFamily.from(chipName: dc.chip) else { continue }
                     if let index = groups.firstIndex(where: { $0.chip == chip }) {
-                        groups[index].devices.append(dc.device)
+                        if !groups[index].devices.contains(dc.device) {
+                            groups[index].devices.append(dc.device)
+                        }
                     } else {
                         groups.append(ChipGroup(chip: chip, devices: [dc.device], arch: kernel.arch))
                     }
@@ -89,7 +91,9 @@ struct ChipSupportView: View {
                     let chip = DeviceRegistry.chip(for: device) ?? kernelChip
                     guard let chip else { continue }
                     if let index = groups.firstIndex(where: { $0.chip == chip }) {
-                        groups[index].devices.append(device)
+                        if !groups[index].devices.contains(device) {
+                            groups[index].devices.append(device)
+                        }
                     } else {
                         groups.append(ChipGroup(chip: chip, devices: [device], arch: kernel.arch))
                     }
diff --git a/macOSdbApp/Views/ReleaseDetailView.swift b/macOSdbApp/Views/ReleaseDetailView.swift
@@ -100,32 +100,7 @@ struct ReleaseDetailView: View {
                 .fontWeight(.semibold)
 
             ForEach(release.kernels) { kernel in
-                HStack(alignment: .top, spacing: 16) {
-                    VStack(alignment: .leading, spacing: 4) {
-                        Text(kernel.chip)
-                            .font(.headline)
-                        Text("Darwin \(kernel.darwinVersion)")
-                            .font(.callout)
-                        if let xnuVersion = kernel.xnuVersion {
-                            Text("XNU \(xnuVersion)")
-                                .font(.callout)
-                                .foregroundStyle(.secondary)
-                        }
-                    }
-
-                    Spacer()
-
-                    VStack(alignment: .trailing, spacing: 4) {
-                        Text(kernel.arch)
-                            .font(.caption)
-                            .foregroundStyle(.secondary)
-                        Text(kernel.devices.joined(separator: ", "))
-                            .font(.caption2)
-                            .foregroundStyle(.tertiary)
-                    }
-                }
-                .padding(12)
-                .background(.quaternary.opacity(0.3), in: RoundedRectangle(cornerRadius: 8))
+                KernelCard(kernel: kernel)
             }
         }
     }
@@ -152,3 +127,46 @@ struct ReleaseDetailView: View {
         }
     }
 }
+
+// MARK: - Kernel Card
+
+private struct KernelCard: View {
+    let kernel: KernelInfo
+
+    var body: some View {
+        HStack(alignment: .top, spacing: 16) {
+            VStack(alignment: .leading, spacing: 4) {
+                HStack(spacing: 6) {
+                    Text(kernel.sortedChipNames.joined(separator: ", "))
+                        .font(.headline)
+                    if kernel.isDevelopment {
+                        Text("Development")
+                            .font(.caption2)
+                            .fontWeight(.medium)
+                            .foregroundStyle(.orange)
+                    }
+                }
+                Text("Darwin \(kernel.darwinVersion)")
+                    .font(.callout)
+                if let xnuVersion = kernel.xnuVersion {
+                    Text("XNU \(xnuVersion)")
+                        .font(.callout)
+                        .foregroundStyle(.secondary)
+                }
+            }
+
+            Spacer()
+
+            VStack(alignment: .trailing, spacing: 4) {
+                Text(kernel.arch)
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+                Text(kernel.devices.joined(separator: ", "))
+                    .font(.caption2)
+                    .foregroundStyle(.tertiary)
+            }
+        }
+        .padding(12)
+        .background(.quaternary.opacity(0.3), in: RoundedRectangle(cornerRadius: 8))
+    }
+}
diff --git a/macOSdbApp/Views/SidebarView.swift b/macOSdbApp/Views/SidebarView.swift
