austinywang · Oct 5, 2026 · Oct 2, 2026 · Oct 2, 2026 · Oct 2, 2026 · Oct 3, 2026
@@ -636,6 +636,10 @@ jobs:
         if: ${{ matrix.group == 'ci' && steps.fast-guard.outputs.skip != 'true' }}
         run: python3 tests/test_ci_owned_build_state.py
 
+      - name: Validate canonical root ownership boundary
+        if: ${{ matrix.group == 'ci' && steps.fast-guard.outputs.skip != 'true' }}
+        run: python3 tests/test_ci_take_canonical_root.py
+
       - name: Validate warm-state distance recording and routing
         if: ${{ matrix.group == 'ci' && steps.fast-guard.outputs.skip != 'true' }}
         run: python3 tests/test_ci_warm_distance.py

@@ -1719,7 +1719,7 @@ jobs:
     name: "Dogfood build #${{ github.event.pull_request.number }}"
     needs: [changes, static-preflight]
     if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref != 'feat-cmux-next' && contains(github.event.pull_request.labels.*.name, 'dev-build') && github.event.action != 'unlabeled' && (github.event.action != 'labeled' || github.event.label.name == 'dev-build') && github.repository_owner == 'manaflow-ai' && github.event.pull_request.head.repo.full_name == github.repository && (github.event.pull_request.author_association == 'MEMBER' || github.event.pull_request.author_association == 'OWNER') && needs.changes.result == 'success' && needs.static-preflight.result == 'success' && needs.changes.outputs.macos != 'false' }}
-    runs-on: ${{ github.repository_owner != 'manaflow-ai' && 'ubuntu-24.04' || github.repository_owner != 'manaflow-ai' && 'macos-26' || 'blacksmith-6vcpu-macos-26' }}
+    runs-on: ${{ github.repository_owner != 'manaflow-ai' && 'macos-26' || github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository && 'blacksmith-6vcpu-macos-26' || vars.MACOS_RUNNER_PR || 'blacksmith-6vcpu-macos-26' }}
     timeout-minutes: 45
     # This job is intentionally outside ci-status, so a build or publication
     # failure is visible without becoming a merge requirement.
@@ -1735,6 +1735,9 @@ jobs:
           submodules: recursive
           persist-credentials: false
 
+      - name: Select Xcode
+        run: ./scripts/select-ci-xcode.sh
+
       - name: Download the pinned GhosttyKit
         run: ./scripts/download-prebuilt-ghosttykit.sh
 

diff --git a/Packages/macOS/CmuxCloud/Sources/CmuxCloud/Billing/ProUpgradeSource.swift b/Packages/macOS/CmuxCloud/Sources/CmuxCloud/Billing/ProUpgradeSource.swift
@@ -32,6 +32,8 @@ public enum ProUpgradeSource: String, CaseIterable, Sendable {
     case machinesPanelMachineAction = "mac_machines_panel_machine_action"
     /// New machine sheet refused because the free plan is at its limit.
     case newMachineAtLimit = "mac_new_machine_at_limit"
+    /// "Upgrade Plan" on a create that failed at the plan's machine limit.
+    case createFailedAtLimit = "mac_create_failed_at_limit"
     /// New machine sheet "Upgrade to Max" under the locked 32 GB / 64 GB sizes.
     case newMachineSheetMaxUpgrade = "mac_new_machine_sheet_max_upgrade"
     /// Link inside the `vm_memory_requires_plan` error text (`VMClient`).

diff --git a/Packages/macOS/CmuxCloud/Sources/CmuxCloud/Machines/MachinePlanSnapshot.swift b/Packages/macOS/CmuxCloud/Sources/CmuxCloud/Machines/MachinePlanSnapshot.swift
@@ -44,6 +44,16 @@ public struct MachinePlanSnapshot: Equatable, Sendable {
     /// upgrade affordance after the server returns `vm_requires_pro`.
     public var isPaidPlan: Bool { Self.isPaidPlanID(planId) }
 
+    /// Whether a plan with more machines exists to upgrade to. Max, Team and
+    /// Founders are the top of the ladder; everything else (free, Go, Pro, an
+    /// unknown id) can move up.
+    public var hasHigherPlan: Bool {
+        switch planId.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() {
+        case "max", "team", "founders": return false
+        default: return true
+        }
+    }
+
     public static func isPaidPlanID(_ planId: String) -> Bool {
         switch planId.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() {
         case "go", "pro", "max", "team", "founders":

diff --git a/Packages/macOS/CmuxCloud/Sources/CmuxCloud/Tree/CloudTreeDevicesSection.swift b/Packages/macOS/CmuxCloud/Sources/CmuxCloud/Tree/CloudTreeDevicesSection.swift
@@ -8,14 +8,16 @@ public struct CloudTreeDevicesSection: Equatable, Sendable {
         incomingAccessEnabled: Bool = false,
         discoveryManaged: Bool = false,
         incomingAccessManaged: Bool = false,
-        available: Bool = true
+        available: Bool = true,
+        isRefreshing: Bool = false
     ) {
         self.count = count
         self.discoveryEnabled = discoveryEnabled
         self.incomingAccessEnabled = incomingAccessEnabled
         self.discoveryManaged = discoveryManaged
         self.incomingAccessManaged = incomingAccessManaged
         self.available = available
+        self.isRefreshing = isRefreshing
     }
 
     public var count: Int = 0
@@ -25,9 +27,11 @@ public struct CloudTreeDevicesSection: Equatable, Sendable {
     public var incomingAccessManaged: Bool = false
     /// Whether Cloud availability permits either device preference.
     public var available: Bool = true
+    /// A refresh of the devices list is running; the header's refresh icon spins.
+    public var isRefreshing: Bool = false
 
     /// Both independent actions stay visible below the devices, preceded by
-    /// "No other Macs yet" when the list is empty.
+    /// "No other devices yet" when the list is empty.
     public var inlineRowCount: Int {
         (count == 0 ? 1 : 0) + 2
     }

diff --git a/Packages/macOS/CmuxCloud/Sources/CmuxCloud/Tree/CloudTreePlaceholder.swift b/Packages/macOS/CmuxCloud/Sources/CmuxCloud/Tree/CloudTreePlaceholder.swift
@@ -4,9 +4,10 @@ public struct CloudTreePlaceholder: Equatable, Sendable {
         case dimmed
         case connecting
         case error
-        /// An action row that opens the New Machine sheet: the empty state of
-        /// the Cloud Machines section.
+        /// An action row that opens the New Machine sheet.
         case createMachine
+        /// Plain guidance with no icon or action, like "No cloud machines yet".
+        case empty
     }
 
     public let text: String

diff --git a/Packages/macOS/CmuxCloud/Sources/CmuxCloud/Tree/CloudTreeSectionRefresh.swift b/Packages/macOS/CmuxCloud/Sources/CmuxCloud/Tree/CloudTreeSectionRefresh.swift
@@ -0,0 +1,11 @@
+import Foundation
+
+/// A section header's refresh icon: present while the section has something
+/// to refresh, with a spinner in its place while a refresh runs.
+public struct CloudTreeSectionRefresh: Equatable, Sendable {
+    public var isRefreshing: Bool
+
+    public init(isRefreshing: Bool = false) {
+        self.isRefreshing = isRefreshing
+    }
+}
diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Models/DeviceAccessControl.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Models/DeviceAccessControl.swift
@@ -33,8 +33,8 @@ public struct DeviceAccessControl {
         switch preference {
         case .discovery:
             return isOn
-                ? String(localized: "devices.discovery.stop", defaultValue: "Stop discovering other Macs", bundle: .module)
-                : String(localized: "devices.discovery.toggle", defaultValue: "Discover other Macs")
+                ? String(localized: "devices.discovery.stop", defaultValue: "Stop discovering other devices", bundle: .module)
+                : String(localized: "devices.discovery.toggle", defaultValue: "Discover other devices")
         case .incomingAccess:
             return isOn
                 ? String(localized: "devices.incoming.hide", defaultValue: "Hide this Mac from My Devices", bundle: .module)

diff --git a/.../macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Navigation/CuratedSettingEntry+Devices.swift b/.../macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Navigation/CuratedSettingEntry+Devices.swift
@@ -27,7 +27,7 @@ extension Array where Element == CuratedSettingEntry {
             .init(
                 section: .computers,
                 id: "discovery",
-                title: String(localized: "devices.discovery.toggle", defaultValue: "Discover other Macs"),
+                title: String(localized: "devices.discovery.toggle", defaultValue: "Discover other devices"),
                 detailText: String(localized: "devices.discovery.help", defaultValue: "Find and connect to other Macs signed in to your account. Turning this off disconnects their panes without closing their terminals."),
                 synonyms: "Discover other Macs discovery find connect other computers my devices"
             )

diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Resources/Localizable.xcstrings b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Resources/Localizable.xcstrings
@@ -7101,55 +7101,55 @@
         "en": {
           "stringUnit": {
             "state": "translated",
-            "value": "Stop discovering other Macs"
+            "value": "Stop discovering other devices"
           }
         },
         "ar": {
           "stringUnit": {
             "state": "translated",
-            "value": "إيقاف اكتشاف أجهزة Mac الأخرى"
+            "value": "إيقاف اكتشاف الأجهزة الأخرى"
           }
         },
         "de": {
           "stringUnit": {
             "state": "translated",
-            "value": "Andere Macs nicht mehr finden"
+            "value": "Andere Geräte nicht mehr finden"
           }
         },
         "es": {
           "stringUnit": {
             "state": "translated",
-            "value": "Dejar de descubrir otros Mac"
+            "value": "Dejar de descubrir otros dispositivos"
           }
         },
         "fr": {
           "stringUnit": {
             "state": "translated",
-            "value": "Arrêter de rechercher d’autres Mac"
+            "value": "Arrêter de rechercher d’autres appareils"
           }
         },
         "ja": {
           "stringUnit": {
             "state": "translated",
-            "value": "ほかのMacの検出を停止"
+            "value": "ほかのデバイスの検出を停止"
           }
         },
         "ko": {
           "stringUnit": {
             "state": "translated",
-            "value": "다른 Mac 검색 중지"
+            "value": "다른 기기 검색 중지"
           }
         },
         "zh-Hans": {
           "stringUnit": {
             "state": "translated",
-            "value": "停止发现其他 Mac"
+            "value": "停止发现其他设备"
           }
         },
         "zh-Hant": {
           "stringUnit": {
             "state": "translated",
-            "value": "停止尋找其他 Mac"
+            "value": "停止尋找其他裝置"
           }
         }
       }

diff --git a/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/ComputersSection.swift b/Packages/macOS/CmuxSettingsUI/Sources/CmuxSettingsUI/Sections/ComputersSection.swift
@@ -64,10 +64,10 @@ public struct ComputersSection: View {
                 } else if discoveryManaged {
                     SettingsCardNote(String(localized: "devices.managed", defaultValue: "Disabled by your administrator."))
                 } else if !discoveryEnabled {
-                    SettingsCardNote(String(localized: "devices.discovery.settingsDisabled", defaultValue: "Turn on Discover other Macs to see your devices."))
+                    SettingsCardNote(String(localized: "devices.discovery.settingsDisabled", defaultValue: "Turn on Discover other devices to see your devices."))
                 } else if snapshot.computers.isEmpty {
                     VStack(alignment: .leading, spacing: 6) {
-                        Label(String(localized: "devices.empty.title", defaultValue: "No other Macs yet"), systemImage: "desktopcomputer")
+                        Label(String(localized: "devices.empty.title", defaultValue: "No other devices yet"), systemImage: "desktopcomputer")
                             .font(.callout.weight(.medium))
                         Text(String(localized: "devices.empty.help", defaultValue: "Sign in to cmux on another Mac and make it discoverable in Settings › Devices."))
                             .font(.callout)

diff --git a/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/DeviceAccessControlTests.swift b/Packages/macOS/CmuxSettingsUI/Tests/CmuxSettingsUITests/DeviceAccessControlTests.swift
@@ -8,7 +8,7 @@ struct DeviceAccessControlTests {
         let incoming = DeviceAccessControl(.incomingAccess, enabled: enabled, managed: false)
         let discovery = DeviceAccessControl(.discovery, enabled: enabled, managed: false)
         #expect(incoming.title == (enabled ? "Hide this Mac from My Devices" : "Make this Mac discoverable"))
-        #expect(discovery.title == (enabled ? "Stop discovering other Macs" : "Discover other Macs"))
+        #expect(discovery.title == (enabled ? "Stop discovering other devices" : "Discover other devices"))
         #expect(incoming.isOn == enabled)
         #expect(discovery.isOn == enabled)
         #expect(incoming.isEnabled && discovery.isEnabled)
@@ -20,7 +20,7 @@ struct DeviceAccessControlTests {
         let control = DeviceAccessControl(preference, enabled: true, managed: managed, unavailable: !managed)
         #expect(!control.isOn)
         #expect(!control.isEnabled)
-        #expect(control.title == (preference == .incomingAccess ? "Make this Mac discoverable" : "Discover other Macs"))
+        #expect(control.title == (preference == .incomingAccess ? "Make this Mac discoverable" : "Discover other devices"))
         if managed { #expect(control.help == "Disabled by your administrator.") }
     }
 }