Skip to content

feat(updates): enable Sparkle Nightly channel on macOS 27 - #787

Merged
diazdesandi merged 15 commits into
feat/macos-27-experimentalfrom
feat/sparkle-nightly-channel
Jul 23, 2026
Merged

diazdesandi merged 15 commits into
feat/macos-27-experimentalfrom
feat/sparkle-nightly-channel

Conversation

@diazdesandi

@diazdesandi diazdesandi commented Jul 16, 2026 •

Copy link
Copy Markdown
Member

Summary

Re-enables Sparkle on macOS 27 and restores the About updates UI. Adds an UpdateChannel picker — Stable / Development (beta) / Nightly (alpha) — with macOS 27 defaulting to Nightly when unset.

Scope: Update-channel UI + Sparkle enablement for macOS 27 preview/Nightly distribution.

External contributors: before opening a PR for a bug fix or new feature, please make sure there's a corresponding issue in the issue tracker. PRs that fix or change things that haven't been reported/agreed on may be closed without review.

Closes: N/A

PR Type

Describe what this change does (not the linked issue’s request kind). Bug reports use bug on issues; bug fixes use fix on PRs.

If you tick Feature or Refactor and touch more than ~20 files, please mention why this can’t be split.

  • Bug fix
  • CI/CD
  • Documentation
  • Feature
  • Enhancement
  • Performance improvement
  • Refactor
  • Test addition or update
  • Other (please describe)

Area

Product surfaces (optional when the change is not about the app UI). Path-based labeling also applies.

  • Use PR Type for what changed (CI/CD, Documentation, Other / chore, etc.).

  • Use ops for where when it is repo operations: CI, release, GitHub hygiene, scripts, lint/sonar config — not a product surface.

  • menubar

  • icebar

  • layout

  • appearance

  • settings

  • onboarding

  • permissions

  • profiles

  • hotkeys

  • updates

  • ops

Does this PR introduce a breaking change?

  • Yes - if yes, please describe the impact and migration path
  • No

What is the new behavior?

  • Sparkle checks and About updates section available again on macOS 27.
  • UpdateChannel replaces boolean beta toggle: Stable / Development / Nightly.
  • macOS 27 unset channel defaults to Nightly for alpha appcast items.
  • Legacy AllowsBetaUpdates=true migrates to Development.

PR Checklist

  • I've built and run the app locally and verified that it works as expected.
  • I've run swiftformat . to keep the code style consistent.
  • I've run the smallest relevant test commands (list 1–2 below), e.g. xcodebuild test … or swift test --package-path MenuBarModel.
  • I've added tests for new behavior (if applicable).
  • I've documented new public APIs / non-obvious helpers.
  • I've updated documentation as needed.
  • This PR targets the development branch.

Test commands run:

  • (manual validation checklist in Other information)

Known limitations / follow-ups

Other information

Validation

  • About channel picker defaults to Nightly on 27
  • Nightly → alpha; Development → beta; Stable → default only
  • Check for Updates appears on macOS 27
  • Legacy AllowsBetaUpdates=true → Development
  • Alpha appcast item only when Nightly selected

Summary by CodeRabbit

  • New Features

    • Added update-channel selection for Stable, Development, and Nightly releases.
    • macOS 27 preview builds now use the Nightly channel, with channel controls clearly reflected in Settings.
    • Improved update controls and status information in the About section.
  • Bug Fixes

    • Improved recognition and placement of Siri menu bar items.
    • Refined system-item hiding and positioning behavior on macOS 27.
    • Corrected cache handling and stale menu bar state cleanup.

Add UpdateChannel (stable/beta/alpha), show About update controls on
macOS 27 again, and default preview builds to the Nightly (alpha)
Sparkle channel so experimental builds can ship via appcast once CI
publishes alpha-tagged releases.
@coderabbitai

coderabbitai Bot commented Jul 16, 2026 •

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: b72f7a40-1ce6-49fe-aa01-795f4e226fa8

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • ✅ Review completed - (🔄 Check again to review again)
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch feat/sparkle-nightly-channel

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

Keep Sparkle Nightly channel enablement while adopting the MenuBarModel
Constants split (LegacyConstants / ThawMenuBarIdentity).
Add KeyCapView, SecondsLabel, and MenuBarItemAutoDetectedNameTests so
CI's committed xcfilelist matches generate-swiftlint-inputs.sh.
@thaw-app thaw-app deleted a comment from coderabbitai Bot Jul 22, 2026
@thaw-app thaw-app deleted a comment from coderabbitai Bot Jul 22, 2026
@github-actions github-actions Bot added the feature New capability that did not exist before label Jul 22, 2026
Use the production bundle ID in CI (Debug .debug stays local-only), fix
MenuBarAgent Siri trail ranking, and update stale expectations after the
forced-visible MenuBarAgent assignment change.
A global PRODUCT_BUNDLE_IDENTIFIER rewrite also forced MenuBarItemService
and ThawTests onto com.stonerl.Thaw, breaking XPC identity and test hosting.
…aw-devrun

Debug/CI now expand to the production bundle id by default. thaw-devrun.sh
alone sets THAW_BUNDLE_ID_SUFFIX=.debug for the /Applications local install.
@github-actions github-actions Bot added ops CI, release, GitHub hygiene, scripts — repo operations, not a product surface updates Sparkle / release channels / appcast settings Settings UI not covered by a more specific area labels Jul 23, 2026
@sonarqubecloud

Copy link
Copy Markdown

diazdesandi and others added 5 commits July 22, 2026 23:03
The Nightly segment in the update channel picker had no String Catalog
entry. Add the English source key (Crowdin syncs the translations, per
the block-translation policy) so the label is extracted instead of
falling through as an untracked literal.
The build/showBuildSettings invocations still referenced the pre-rename
PACKAGE_RESOLUTION_ARGS array, which is never defined, so `set -u`
aborted the run before xcodebuild started. Point both at the actual
LOCKED_PACKAGE_ARGS array.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
PlatformRuntimeKit's PositionHideBackend parks and restores the Focus
and Now Playing MenuBarAgent modules through their stable status:/module:
keys and expects this predicate on MenuBarItemTag. Resolve the module
via SystemMenuBarModuleCatalog and return true only for those two.
Flatten the update settings (no grouped card or separators) and tighten
the controls:

- Move the update trigger onto the channel row as an "Update" button
  using the circular arrow.clockwise icon (accessibility label kept as
  "Check for Updates"); the row below now shows only the last-checked
  timestamp.
- Nightly is selectable on every system, but macOS 27 ships exclusively
  through Nightly: the row shows a fixed "Nightly" value and
  UpdatesManager forces the alpha channel while ignoring change attempts,
  so users can't switch to a build that lacks macOS 27 support.

@coderabbitai coderabbitai Bot left a comment •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@scripts/swiftlint-inputs.xcfilelist`:
- Line 31: Regenerate scripts/swiftlint-inputs.xcfilelist using
scripts/generate-swiftlint-inputs.sh, ensuring the generated output includes the
missing MenuBarItemGrouping.swift, MenuBarItemGroupingTests.swift, and
LayoutBarGroupHandleView.swift entries, then commit the complete regenerated
file.

In `@Thaw/Main/Updates.swift`:
- Around line 24-32: Update the channel-selection logic around
allowedSparkleChannels/allowedChannels(for:) so macOS 27 alpha updates exclude
Sparkle’s implicit untagged default (Stable) channel, leaving only alpha-tagged
items; use an alpha-only feed or the existing selection/exclusion hook, while
preserving current behavior for other channels and macOS versions.
🪄 Autofix (Beta)

✅ Autofix completed


ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: 5a94914c-132c-4e1e-a18e-14d94625bf79

📥 Commits

Reviewing files that changed from the base of the PR and between 1092327 and a1ef439.

📒 Files selected for processing (16)
  • MenuBarModel/Sources/MenuBarModel/MenuBarItemTag.swift
  • Thaw.xcodeproj/project.pbxproj
  • Thaw/Main/Updates.swift
  • Thaw/Resources/Localizable.xcstrings
  • Thaw/Settings/SettingsPanes/AboutSettingsPane.swift
  • Thaw/Utilities/Constants.swift
  • ThawTests/LayoutOpaqueSlotTests.swift
  • ThawTests/MaintenanceToolsCacheTests.swift
  • ThawTests/MenuBarAgentPositionStoreTests.swift
  • ThawTests/MenuBarItemImageCacheFreshBoundsTests.swift
  • ThawTests/MenuBarItemTagTests.swift
  • ThawTests/MenuBarTestFixtures.swift
  • ThawTests/MenuBarTestFixturesTests.swift
  • ThawTests/NativeOverflowStateReducerTests.swift
  • scripts/swiftlint-inputs.xcfilelist
  • scripts/thaw-devrun.sh

$(SRCROOT)/MenuBarModel/Sources/MenuBarModel/WindowInfo.swift
$(SRCROOT)/MenuBarModel/Tests/MenuBarModelTests/DiagnosticLoggerTests.swift
$(SRCROOT)/MenuBarModel/Tests/MenuBarModelTests/LegacyConstantsCompatibilityTests.swift
$(SRCROOT)/MenuBarModel/Tests/MenuBarModelTests/MenuBarItemAutoDetectedNameTests.swift

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎯 Functional Correctness | 🟠 Major | ⚡ Quick win

Regenerate the complete SwiftLint input list before merging.

CI still fails because the generated file also contains these missing entries:

  • $(SRCROOT)/MenuBarModel/Sources/MenuBarModel/MenuBarItemGrouping.swift
  • $(SRCROOT)/MenuBarModel/Tests/MenuBarModelTests/MenuBarItemGroupingTests.swift
  • $(SRCROOT)/Thaw/MenuBar/LayoutBar/LayoutBarGroupHandleView.swift

Run scripts/generate-swiftlint-inputs.sh and commit the resulting file so it matches CI’s generated output.

Also applies to: 106-106, 175-175

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@scripts/swiftlint-inputs.xcfilelist` at line 31, Regenerate
scripts/swiftlint-inputs.xcfilelist using scripts/generate-swiftlint-inputs.sh,
ensuring the generated output includes the missing MenuBarItemGrouping.swift,
MenuBarItemGroupingTests.swift, and LayoutBarGroupHandleView.swift entries, then
commit the complete regenerated file.

Source: Pipeline failures

Comment thread Thaw/Main/Updates.swift
Comment on lines +24 to +32
var allowedSparkleChannels: Set<String> {
switch self {
case .stable:
[]
case .beta:
["beta"]
case .alpha:
["alpha"]
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎯 Functional Correctness | 🟠 Major | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

# Inspect whether macOS 27 uses a dedicated Sparkle feed or only an allowed-channel set.
rg -n -C3 'allowedChannels|feedURLString|SUFeedURL|sparkle:channel|alpha' Thaw Thaw.xcodeproj 2>/dev/null || true

Repository: stonerl/Thaw

Length of output: 40895


🌐 Web query:

Sparkle SPUUpdaterDelegate allowedChannels default channel documentation

💡 Result:

In the Sparkle framework, the default channel is the implicit channel used for all appcast items that do not specify a sparkle:channel element [1][2]. Regarding the SPUUpdaterDelegate protocol and its allowedChannelsForUpdater: method: * Default Behavior: By default, an updater only looks for updates posted to the default channel [2]. * Implicit Inclusion: The default channel is always included in the set of allowed channels, meaning an updater cannot exclude itself from the default channel [1][3]. * Delegate Implementation: If you implement allowedChannelsForUpdater:, returning an empty set (Set<String>()) is equivalent to the default behavior, where the updater only searches for updates in the default channel [1][4]. * Purpose: This mechanism allows you to authorize an updater to check for additional channels (e.g., "beta") in addition to the default channel [1][2]. In summary, the default channel is always active and cannot be disabled; specifying other channels via this delegate method simply grants the updater access to search those specific channels alongside the default one [1][2].

Citations:


🌐 Web query:

Sparkle delegate appcastItemSelectionFilterForUpdater updater appcastItem sparkle channel filtering

💡 Result:

The term appcastItemSelectionFilterForUpdater does not exist in the Sparkle framework API [1][2]. It appears to be a misunderstanding of the available delegate methods used for filtering and selecting updates [1][3]. If your goal is to filter updates based on channels or specific criteria, you should use the following recommended approaches provided by the SPUUpdaterDelegate protocol [1][3]: 1. Filtering by Channels: Instead of manually filtering appcast items, Sparkle 2.0+ uses a built-in channel system [4]. You can specify allowed channels by implementing the allowedChannelsForUpdater: method in your SPUUpdaterDelegate [4][5]. Example (Swift): func allowedChannels(for updater: SPUUpdater) -> Set { return Set(["beta"]) } 2. Advanced Selection Logic: If you need custom logic to determine the best update from an appcast, use the bestValidUpdateInAppcast:forUpdater: delegate method [1][2]. * This method allows you to return a specific SUAppcastItem from the provided appcast [1][2]. * Returning nil tells Sparkle to handle the selection automatically [1][6]. * Returning SUAppcastItem.emptyAppcastItem tells Sparkle that no update should be picked [1][6][7]. * Note: Sparkle performs its own filtering for OS version requirements before this method is called, so you should not re-implement that logic [1][3]. If you make changes to these settings at runtime (such as changing allowed channels), call [SPUUpdater resetUpdateCycle] or [SPUUpdater resetUpdateCycleAfterShortDelay] to trigger a new check with the updated configuration [8][9].

Citations:


🌐 Web query:

Sparkle SPUUpdaterDelegate bestValidUpdateInAppcast bestValidUpdateInAppcastForUpdater documentation

💡 Result:

The method bestValidUpdateInAppcast:forUpdater: is an optional method in the SPUUpdaterDelegate protocol within the Sparkle framework [1][2]. It allows developers to provide custom logic for selecting the most appropriate update from an appcast [1][3]. Key details and guidelines for implementing this method: Implementation Purpose: Use this method only if you have special requirements or custom extensions in your appcast that necessitate custom selection logic [1][2]. If you do not need to override the default selection behavior, return nil, and Sparkle will handle it automatically [1][3]. Constraints and Best Practices: - Do not filter by OS version or minimum autoupdate version, as Sparkle handles these automatically [1][4]. - Do not return delta items; return a top-level item and allow Sparkle to select the appropriate delta if one exists [1][5]. - If no update is considered valid, return +[SUAppcastItem emptyAppcastItem] [1][6]. - Ensure your implementation is efficient, as it may be called multiple times [1][3]. - Do not select an item with a version worse (older) than the currently installed application version if an item matching the current version is available [1][4]. Alternatives: Sparkle recommends using other features where possible [1][5]. For example, if you want to filter specific update channels (e.g., betas), use the allowedChannelsForUpdater: delegate method instead [2][3]. Declaration: Objective-C: - (nullable SUAppcastItem *)bestValidUpdateInAppcast:(nonnull SUAppcast *)appcast forUpdater:(nonnull SPUUpdater *)updater; Swift: optional func bestValidUpdate(in appcast: SUAppcast, for updater: SPUUpdater) -> SUAppcastItem? For further guidance, see the official Sparkle project documentation on the SPUUpdaterDelegate protocol [1] and the upgrading guide [5].

Citations:


Prevent the default Sparkle channel for macOS 27 updates.

allowedChannels(for:) only adds channels; Sparkle always includes the implicit default channel as well. On macOS 27, .alpha therefore allows both sparkle:channel="alpha" and untagged Stable items, which contradicts the intended Nightly exclusion. Use an alpha-only feed for macOS 27, or override Sparkle’s item selection/exclusion path to drop default-channel items.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Thaw/Main/Updates.swift` around lines 24 - 32, Update the channel-selection
logic around allowedSparkleChannels/allowedChannels(for:) so macOS 27 alpha
updates exclude Sparkle’s implicit untagged default (Stable) channel, leaving
only alpha-tagged items; use an alpha-only feed or the existing
selection/exclusion hook, while preserving current behavior for other channels
and macOS versions.

@coderabbitai

coderabbitai Bot commented Jul 23, 2026 •

Copy link
Copy Markdown
Contributor

Note

Autofix is a beta feature. Expect some limitations and changes as we gather feedback and continue to improve it.

Fixes Applied Successfully

Fixed 1 file(s) based on 2 unresolved review comments.

Files modified:

  • scripts/swiftlint-inputs.xcfilelist

Commit: b6e2b6abbdc63e96fbe5c5bfc458eaf5b24a4674

The changes have been pushed to the feat/sparkle-nightly-channel branch.

Time taken: 3m 37s

Fixed 1 file(s) based on 2 unresolved review comments.

Co-authored-by: CodeRabbit <noreply@coderabbit.ai>
@diazdesandi
diazdesandi merged commit 46bd557 into feat/macos-27-experimental Jul 23, 2026
6 of 7 checks passed
@diazdesandi
diazdesandi deleted the feat/sparkle-nightly-channel branch July 23, 2026 07:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

feature New capability that did not exist before ops CI, release, GitHub hygiene, scripts — repo operations, not a product surface settings Settings UI not covered by a more specific area updates Sparkle / release channels / appcast

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant