Update popover: show the top changes and a readable version line

Packages/macOS/CmuxUpdater/Sources/CmuxUpdater/TestSupport/UpdateTestSupport.swift

@@ -115,18 +115,24 @@ public struct UpdateTestSupport {
         }
     }
 
+    /// `CMUX_UI_TEST_UPDATE_DESCRIPTION`, `_PUB_DATE`, and `_LENGTH` override the item's
+    /// feed description, publication date, and download size.
     private static func makeAppcastItem(displayVersion: String) -> SUAppcastItem? {
+        let env = ProcessInfo.processInfo.environment
         let enclosure: [String: Any] = [
             "url": "https://example.com/cmux.zip",
-            "length": "1024",
+            "length": env["CMUX_UI_TEST_UPDATE_LENGTH"] ?? "1024",
             "sparkle:version": displayVersion,
             "sparkle:shortVersionString": displayVersion,
         ]
-        let dict: [String: Any] = [
+        var dict: [String: Any] = [
             "title": "cmux \(displayVersion)",
-            "pubDate": "Wed, 25 Mar 2026 12:00:00 +0000",
+            "pubDate": env["CMUX_UI_TEST_UPDATE_PUB_DATE"] ?? "Wed, 25 Mar 2026 12:00:00 +0000",
             "enclosure": enclosure,
         ]
+        if let description = env["CMUX_UI_TEST_UPDATE_DESCRIPTION"] {
+            dict["description"] = description
+        }
         return SUAppcastItem(dictionary: dict)
     }
 }

Packages/macOS/CmuxUpdaterUI/Sources/CmuxUpdaterUI/UpdatePopoverView.swift

@@ -78,34 +78,36 @@ public struct UpdatePopoverView: View {
 
 private struct UpdateMetadataView: View {
     let item: SUAppcastItem
-    let labelWidth: CGFloat
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 4) {
-            HStack(spacing: 6) {
-                Text(String(localized: "update.popover.version", defaultValue: "Version:"))
-                    .foregroundColor(.secondary)
-                    .frame(width: labelWidth, alignment: .trailing)
-                Text(item.displayVersionString)
-            }
-            .cmuxFont(size: 11)
-
-            if item.contentLength > 0 {
-                HStack(spacing: 6) {
-                    Text(String(localized: "update.popover.size", defaultValue: "Size:"))
-                        .foregroundColor(.secondary)
-                        .frame(width: labelWidth, alignment: .trailing)
-                    Text(ByteCountFormatter.string(fromByteCount: Int64(item.contentLength), countStyle: .file))
-                }
+        let summary = UpdateSummary(item: item)
+        VStack(alignment: .leading, spacing: 6) {
+            Text(summary.headline)
                 .cmuxFont(size: 11)
-            }
+                .foregroundColor(.secondary)
+
+            if !summary.changes.isEmpty {
+                VStack(alignment: .leading, spacing: 3) {
+                    ForEach(Array(summary.changes.enumerated()), id: \.offset) { _, change in
+                        HStack(alignment: .firstTextBaseline, spacing: 6) {
+                            Text("•")
+                                .foregroundColor(.secondary)
+                            Text(change)
+                                .lineLimit(2)
+                                .fixedSize(horizontal: false, vertical: true)
+                        }
+                    }
 
-            if let date = item.date {
-                HStack(spacing: 6) {
-                    Text(String(localized: "update.popover.released", defaultValue: "Released:"))
-                        .foregroundColor(.secondary)
-                        .frame(width: labelWidth, alignment: .trailing)
-                    Text(date.formatted(date: .abbreviated, time: .omitted))
+                    if summary.remainingCount > 0 {
+                        let remaining = summary.remainingCount
+                        let label = String(localized: "update.popover.andMore", defaultValue: "and \(remaining) more")
+                        if let url = item.fullReleaseNotesURL ?? UpdateState.ReleaseNotes(displayVersionString: item.displayVersionString)?.url {
+                            Link(label, destination: url)
+                        } else {
+                            Text(label)
+                                .foregroundColor(.secondary)
+                        }
+                    }
                 }
                 .cmuxFont(size: 11)
             }
@@ -143,16 +145,14 @@ private struct DetectedBackgroundUpdateView: View {
     let actions: any UpdateActionsHost
     let dismiss: () -> Void
 
-    private let labelWidth: CGFloat = 60
-
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
             VStack(alignment: .leading, spacing: 12) {
                 VStack(alignment: .leading, spacing: 8) {
                     Text(String(localized: "update.popover.updateAvailable", defaultValue: "Update Available"))
                         .cmuxFont(size: 13, weight: .semibold)
 
-                    UpdateMetadataView(item: item, labelWidth: labelWidth)
+                    UpdateMetadataView(item: item)
                 }
 
                 HStack(spacing: 8) {
@@ -287,16 +287,14 @@ private struct UpdateAvailableView: View {
     let actions: any UpdateActionsHost
     let dismiss: () -> Void
 
-    private let labelWidth: CGFloat = 60
-
     var body: some View {
         VStack(alignment: .leading, spacing: 0) {
             VStack(alignment: .leading, spacing: 12) {
                 VStack(alignment: .leading, spacing: 8) {
                     Text(String(localized: "update.popover.updateAvailable", defaultValue: "Update Available"))
                         .cmuxFont(size: 13, weight: .semibold)
 
-                    UpdateMetadataView(item: update.appcastItem, labelWidth: labelWidth)
+                    UpdateMetadataView(item: update.appcastItem)
                 }
 
                 HStack(spacing: 8) {

Packages/macOS/CmuxUpdaterUI/Sources/CmuxUpdaterUI/UpdateSummary.swift

@@ -0,0 +1,113 @@
+import Foundation
+@preconcurrency import Sparkle
+
+/// What the update popover says about an available update: one readable line in
+/// place of the raw version string, and the first few changes from the feed.
+struct UpdateSummary: Equatable {
+    /// The most changes listed inline before "and N more".
+    static let maxInlineChanges = 5
+
+    /// "Nightly · Today at 12:20 PM · 23 changes" or "0.65.1 · Oct 5".
+    let headline: String
+    /// Up to ``maxInlineChanges`` change titles from the feed description.
+    let changes: [String]
+    /// Changes the feed counted but the popover does not list.
+    let remainingCount: Int
+
+    init(item: SUAppcastItem, now: Date = Date(), locale: Locale = .current, timeZone: TimeZone = .current) {
+        self.init(
+            displayVersion: item.displayVersionString,
+            date: item.date,
+            itemDescription: item.itemDescription,
+            now: now,
+            locale: locale,
+            timeZone: timeZone
+        )
+    }
+
+    init(
+        displayVersion: String,
+        date: Date?,
+        itemDescription: String?,
+        now: Date = Date(),
+        locale: Locale = .current,
+        timeZone: TimeZone = .current
+    ) {
+        let feed = Self.parse(itemDescription ?? "")
+        changes = Array(feed.titles.prefix(Self.maxInlineChanges))
+        remainingCount = feed.total - changes.count
+
+        let isNightly = displayVersion.localizedCaseInsensitiveContains("nightly")
+        var parts: [String] = []
+        if isNightly {
+            parts.append(String(localized: "update.popover.channel.nightly", defaultValue: "Nightly"))
+        } else {
+            parts.append(displayVersion)
+        }
+        if let date {
+            parts.append(isNightly
+                ? Self.nightlyDate(date, now: now, locale: locale, timeZone: timeZone)
+                : Self.stableDate(date, locale: locale, timeZone: timeZone))
+        }
+        if feed.total > 0 {
+            let total = feed.total
+            parts.append(String(localized: "update.popover.changeCount", defaultValue: "\(total) changes"))
+        }
+        headline = parts.joined(separator: " · ")
+    }
+
+    /// Reads the plain-text summary `scripts/ci/nightly_release_notes.py` writes
+    /// into the feed item's `<description>`: up to five "Title (#123)" lines,
+    /// then "and N more" and "Infrastructure: N" when they apply. Infrastructure
+    /// PRs are not counted as changes, and the empty-range sentences list none.
+    static func parse(_ description: String) -> (titles: [String], total: Int) {
+        var titles: [String] = []
+        var more = 0
+        for rawLine in description.components(separatedBy: .newlines) {
+            let line = rawLine.trimmingCharacters(in: .whitespaces)
+            if line.isEmpty || line.hasPrefix("Infrastructure:") || line.hasPrefix("No product PRs") || line.hasPrefix("See the release page") {
+                continue
+            }
+            if let count = capture(#"^and (\d+) more$"#, in: line).flatMap({ Int($0) }) {
+                more += count
+                continue
+            }
+            let title = line.replacingOccurrences(of: #"\s*\(#\d+\)$"#, with: "", options: .regularExpression)
+            if !title.isEmpty {
+                titles.append(title)
+            }
+        }
+        return (titles, titles.count + more)
+    }
+
+    private static func nightlyDate(_ date: Date, now: Date, locale: Locale, timeZone: TimeZone) -> String {
+        var calendar = Calendar(identifier: .gregorian)
+        calendar.timeZone = timeZone
+        let formatter = DateFormatter()
+        formatter.locale = locale
+        formatter.timeZone = timeZone
+        formatter.timeStyle = .short
+        if calendar.isDate(date, inSameDayAs: now) || calendar.isDate(date, inSameDayAs: now.addingTimeInterval(-86_400)) {
+            formatter.dateStyle = .medium
+            formatter.doesRelativeDateFormatting = true
+        } else {
+            formatter.setLocalizedDateFormatFromTemplate("MMMd jmm")
+        }
+        return formatter.string(from: date)
+    }
+
+    private static func stableDate(_ date: Date, locale: Locale, timeZone: TimeZone) -> String {
+        let formatter = DateFormatter()
+        formatter.locale = locale
+        formatter.timeZone = timeZone
+        formatter.setLocalizedDateFormatFromTemplate("MMMd")
+        return formatter.string(from: date)
+    }
+
+    private static func capture(_ pattern: String, in text: String) -> String? {
+        guard let regex = try? NSRegularExpression(pattern: pattern),
+              let match = regex.firstMatch(in: text, range: NSRange(text.startIndex..., in: text)),
+              let range = Range(match.range(at: 1), in: text) else { return nil }
+        return String(text[range])
+    }
+}

Packages/macOS/CmuxUpdaterUI/Tests/CmuxUpdaterUITests/UpdateSummaryTests.swift

@@ -0,0 +1,103 @@
+import Foundation
+import Testing
+@testable import CmuxUpdaterUI
+
+@Suite struct UpdateSummaryTests {
+    private let utc = TimeZone(identifier: "UTC")!
+    private let locale = Locale(identifier: "en_US")
+
+    private func date(_ day: Int, _ hour: Int, _ minute: Int) -> Date {
+        var calendar = Calendar(identifier: .gregorian)
+        calendar.timeZone = utc
+        return calendar.date(from: DateComponents(year: 2026, month: 10, day: day, hour: hour, minute: minute))!
+    }
+
+    // The shape scripts/ci/nightly_release_notes.py writes into <description>.
+    private let nightlyFeed = """
+    Show the top changes in the update popover (#17460)
+    Keep the sidebar order after a crash (#17455)
+    Fix a focus jump when closing a split (#17450)
+    Restore browser zoom per site (#17441)
+    Speed up workspace switching (#17432)
+    and 18 more
+    Infrastructure: 7
+    """
+
+    @Test func nightlyListsFiveChangesAndCountsTheRest() {
+        let summary = UpdateSummary(
+            displayVersion: "0.65.0-nightly.3737789529201",
+            date: date(5, 12, 20),
+            itemDescription: nightlyFeed,
+            now: date(5, 18, 0),
+            locale: locale,
+            timeZone: utc
+        )
+        #expect(summary.changes == [
+            "Show the top changes in the update popover",
+            "Keep the sidebar order after a crash",
+            "Fix a focus jump when closing a split",
+            "Restore browser zoom per site",
+            "Speed up workspace switching",
+        ])
+        #expect(summary.remainingCount == 18)
+        #expect(summary.headline.hasPrefix("Nightly · Today"))
+        #expect(summary.headline.hasSuffix(" · 23 changes"))
+        #expect(!summary.headline.contains("3737789529201"))
+    }
+
+    @Test func olderNightlyShowsItsDayInsteadOfToday() {
+        let summary = UpdateSummary(
+            displayVersion: "0.65.0-nightly.3735594566602",
+            date: date(1, 9, 5),
+            itemDescription: nil,
+            now: date(5, 18, 0),
+            locale: locale,
+            timeZone: utc
+        )
+        #expect(summary.headline.hasPrefix("Nightly · Oct 1"))
+        #expect(summary.changes.isEmpty)
+    }
+
+    @Test func stableShowsVersionAndDay() {
+        let summary = UpdateSummary(
+            displayVersion: "0.65.1",
+            date: date(5, 15, 0),
+            itemDescription: nil,
+            locale: locale,
+            timeZone: utc
+        )
+        #expect(summary.headline == "0.65.1 · Oct 5")
+        #expect(summary.changes.isEmpty)
+        #expect(summary.remainingCount == 0)
+    }
+
+    @Test func emptyRangeListsNothing() {
+        let summary = UpdateSummary(
+            displayVersion: "0.65.0-nightly.3737789529201",
+            date: nil,
+            itemDescription: "No product PRs merged since the previous published build.",
+            locale: locale,
+            timeZone: utc
+        )
+        #expect(summary.changes.isEmpty)
+        #expect(summary.headline == "Nightly")
+    }
+
+    @Test func infrastructureOnlyCountsNoChanges() {
+        let parsed = UpdateSummary.parse("Infrastructure: 4")
+        #expect(parsed.titles.isEmpty)
+        #expect(parsed.total == 0)
+    }
+
+    @Test func shortListHasNoRemainder() {
+        let summary = UpdateSummary(
+            displayVersion: "0.65.0-nightly.1",
+            date: nil,
+            itemDescription: "Fix a crash on launch (#17001)\nInfrastructure: 2",
+            locale: locale,
+            timeZone: utc
+        )
+        #expect(summary.changes == ["Fix a crash on launch"])
+        #expect(summary.remainingCount == 0)
+    }
+}