Require explicit opt-in for iOS pairing

.github/workflows/test-e2e.yml

@@ -582,6 +582,15 @@ jobs:
           if-no-files-found: warn
           retention-days: 30
 
+      - name: Upload test results
+        if: always()
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: test-results
+          path: ${{ env.CMUX_DERIVED_DATA_PATH }}/Logs/Test/*.xcresult
+          if-no-files-found: warn
+          retention-days: 7
+
       - name: Publish test summary
         if: always()
         env:

Packages/Shared/CMUXMobileCore/Sources/CMUXMobileCore/DiagnosticTaxonomy.swift

@@ -846,6 +846,14 @@ public enum DiagnosticAppEventKind: Int, Sendable, Codable, CaseIterable {
     /// The transport that actually carries the foreground connection, recorded
     /// on connect and on every active-route change. `c`: ``DiagnosticTransportKind``.
     case foregroundTransportSelected = 662
+    /// Whether a DEBUG launch supplied an injected dogfood attach route.
+    /// `c`: boolean.
+    case dogfoodAttachEnvironmentObserved = 663
+    /// Whether authentication bootstrap completed with an authenticated user.
+    /// `c`: boolean.
+    case authBootstrapCompleted = 664
+    /// A DEBUG launch attach route was admitted by the startup coordinator.
+    case dogfoodAttachStarted = 665
 }
 
 /// The user's configured connection method, mirrored from the settings picker

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/CMUXMobileRootView.swift

@@ -171,6 +171,14 @@ struct CMUXMobileRootView: View {
         #endif
     }
 
+    private var shouldShowWhatsNewPreview: Bool {
+        #if os(iOS) && DEBUG
+        return UITestConfig.whatsNewPreviewEnabled
+        #else
+        return false
+        #endif
+    }
+
     private var shouldShowOnboardingPreview: Bool {
         #if os(iOS) && DEBUG
         return UITestConfig.onboardingPreviewEnabled
@@ -249,6 +257,14 @@ struct CMUXMobileRootView: View {
         #endif
     }
 
+    @ViewBuilder private var whatsNewPreview: some View {
+        #if os(iOS) && DEBUG
+        MobileWhatsNewPreviewView()
+        #else
+        EmptyView()
+        #endif
+    }
+
     var body: some View {
         rootContent
         #if os(iOS)
@@ -276,6 +292,12 @@ struct CMUXMobileRootView: View {
         .animation(.snappy(duration: 0.18), value: store.phase)
         .onAppear {
             syncShellAuthentication(isAuthenticated)
+            #if os(iOS)
+            diagnosticLog?.recordAppEvent(
+                .dogfoodAttachEnvironmentObserved,
+                count: hasInjectedAttachLaunchRoute ? 1 : 0
+            )
+            #endif
             store.resumeForegroundRefresh()
             #if os(iOS)
             pushCoordinator.bind(store: store)
@@ -495,6 +517,8 @@ struct CMUXMobileRootView: View {
             macSurfaceGalleryPreview
         } else if shouldShowHiddenComputersPreview {
             hiddenComputersPreview
+        } else if shouldShowWhatsNewPreview {
+            whatsNewPreview
         } else if shouldShowOnboardingPreview {
             onboardingPreview
         } else if shouldShowOnboarding {
@@ -1105,6 +1129,10 @@ struct CMUXMobileRootView: View {
         #endif
         await authManager.awaitBootstrapped()
         guard !Task.isCancelled else { return }
+        diagnosticLog?.recordAppEvent(
+            .authBootstrapCompleted,
+            count: authManager.isAuthenticated ? 1 : 0
+        )
         if authManager.isAuthenticated {
             guard prepareResolvedAccountScope() != nil else { return }
         }
@@ -1420,6 +1448,7 @@ struct CMUXMobileRootView: View {
               let attachURL = UITestConfig.dogfoodAttachURL ?? UITestConfig.attachURL else {
             return false
         }
+        diagnosticLog?.recordAppEvent(.dogfoodAttachStarted)
         return startupConnectionCoordinator.startInjectedAttach(
             attachURL: attachURL,
             prepare: {

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Debug/MobileWhatsNewDebugView.swift

@@ -0,0 +1,101 @@
+#if os(iOS) && DEBUG
+import CmuxMobileSupport
+import Foundation
+import SwiftUI
+
+/// A frozen range keeps a catalog refresh from changing an open replay.
+struct MobileWhatsNewReplay: Identifiable {
+    let id = UUID()
+    let pages: [MobileWhatsNewPage]
+
+    init?(pages: [MobileWhatsNewPage], firstID: String, lastID: String) {
+        guard let first = pages.firstIndex(where: { $0.listID == firstID }),
+              let last = pages.firstIndex(where: { $0.listID == lastID }) else { return nil }
+        self.pages = Array(pages[min(first, last)...max(first, last)])
+    }
+}
+
+struct MobileWhatsNewDebugView: View {
+    let pages: [MobileWhatsNewPage]
+    let allowedWebHosts: Set<String>
+    @State private var firstID: String
+    @State private var lastID: String
+    @State private var replay: MobileWhatsNewReplay?
+
+    init(pages: [MobileWhatsNewPage], allowedWebHosts: Set<String>) {
+        self.pages = pages
+        self.allowedWebHosts = allowedWebHosts
+        _firstID = State(initialValue: pages.first?.listID ?? "")
+        _lastID = State(initialValue: pages.last?.listID ?? "")
+    }
+
+    private var selection: MobileWhatsNewReplay? {
+        MobileWhatsNewReplay(pages: pages, firstID: firstID, lastID: lastID)
+    }
+
+    var body: some View {
+        Form {
+            if pages.isEmpty {
+                Text(L10n.string("mobile.whatsNew.debug.empty", defaultValue: "No updates available"))
+            } else {
+                Section {
+                    Picker(
+                        L10n.string("mobile.whatsNew.debug.first", defaultValue: "First Update"),
+                        selection: $firstID
+                    ) {
+                        ForEach(pages, id: \.listID) { page in
+                            Text(page.id).tag(page.listID)
+                        }
+                    }
+                    .accessibilityIdentifier("MobileWhatsNewReplayFirst")
+
+                    Picker(
+                        L10n.string("mobile.whatsNew.debug.last", defaultValue: "Last Update"),
+                        selection: $lastID
+                    ) {
+                        ForEach(pages, id: \.listID) { page in
+                            Text(page.id).tag(page.listID)
+                        }
+                    }
+                    .accessibilityIdentifier("MobileWhatsNewReplayLast")
+                }
+                .pickerStyle(.menu)
+
+                Section {
+                    ForEach(selection?.pages ?? [], id: \.listID) { page in
+                        VStack(alignment: .leading, spacing: 4) {
+                            Text(page.title)
+                            Text(page.id)
+                                .font(.caption)
+                                .foregroundStyle(.secondary)
+                        }
+                    }
+                }
+
+                Section {
+                    Button {
+                        replay = selection
+                    } label: {
+                        Label(
+                            L10n.string("mobile.whatsNew.debug.show", defaultValue: "Show Sheets"),
+                            systemImage: "play.rectangle"
+                        )
+                    }
+                    .disabled(selection == nil)
+                    .accessibilityIdentifier("MobileWhatsNewReplayShow")
+                }
+            }
+        }
+        .navigationTitle(L10n.string("mobile.whatsNew.debug.title", defaultValue: "Replay What's New"))
+        .navigationBarTitleDisplayMode(.inline)
+        .accessibilityIdentifier("MobileWhatsNewDebugView")
+        .sheet(item: $replay) { replay in
+            MobileWhatsNewSheet(
+                pages: replay.pages,
+                allowedWebHosts: allowedWebHosts,
+                dismiss: { self.replay = nil }
+            )
+        }
+    }
+}
+#endif

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/Debug/MobileWhatsNewPreviewView.swift

@@ -0,0 +1,37 @@
+#if os(iOS) && DEBUG
+import SwiftUI
+import Foundation
+
+/// Deterministic What's New host for screenshot checks. It renders the same
+/// native sheet view the app presents after update, but does not require a
+/// signed-in or paired app session.
+public struct MobileWhatsNewPreviewView: View {
+    @State private var showsSheet = true
+    @State private var center = MobileWhatsNewCenter(
+        apiBaseURL: "https://cmux.test",
+        buildType: .beta,
+        defaults: UserDefaults(suiteName: "MobileWhatsNewPreview-\(UUID().uuidString)")!,
+        loader: { _ in throw URLError(.notConnectedToInternet) }
+    )
+
+    public init() {}
+
+    public var body: some View {
+        NavigationStack {
+            MobileWhatsNewListView()
+        }
+            .environment(center)
+            .sheet(isPresented: $showsSheet) {
+                MobileWhatsNewSheet(
+                    pages: MobileWhatsNewCatalog.entries,
+                    allowedWebHosts: [],
+                    dismiss: { showsSheet = false }
+                )
+                .preferredColorScheme(
+                    ProcessInfo.processInfo.environment["CMUX_UITEST_WHATS_NEW_APPEARANCE"] == "dark"
+                        ? .dark : .light
+                )
+            }
+    }
+}
+#endif

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/DeviceTreeView.swift

@@ -203,7 +203,7 @@ struct DeviceTreeView: View {
         if connectionMethodStore?.method == .tailscale {
             return MobilePairingScannerSheet.emptyStateGuidanceText
         }
-        return showAddDevice != nil
+        let description = showAddDevice != nil
             ? L10n.string(
                 "mobile.v2.connections.empty",
                 defaultValue: "On your Mac, turn on Enable iOS pairing in cmux Settings. Select the same team on both devices and keep cmux running. Only Macs you own or have permission to connect to appear here."
@@ -212,6 +212,7 @@ struct DeviceTreeView: View {
                 "mobile.v2.devices.emptyDescription",
                 defaultValue: "On your Mac, turn on Enable iOS pairing in cmux Settings. Select the same team on both devices and keep cmux running. Only Macs you own or have permission to connect to appear here."
             )
+        return "\(description) \(MobilePairingCopy().emptyWorkspaceMessage)"
     }
 
     private func hideComputer(_ computer: MacComputerSnapshot) {

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/DisconnectedWorkspaceShellView.swift

@@ -79,8 +79,8 @@ struct DisconnectedWorkspaceShellView: View {
                         ToolbarItem(placement: .topBarLeading) {
                             Button(action: showComputers) {
                                 MobileDevicesToolbarLabel(
-                                    gateWarningPairingIDs: store?.macVersionUpdateRequiredPairingIDs ?? [],
-                                    computerPairingIDs: savedComputerPairingIDs
+                                    gateWarningDeviceIDs: store?.macVersionUpdateRequiredDeviceIDs ?? [],
+                                    computerDeviceIDs: savedComputerDeviceIDs
                                 )
                             }
                             .accessibilityLabel(L10n.string(
@@ -164,8 +164,11 @@ struct DisconnectedWorkspaceShellView: View {
 
     /// The Computers sheet includes both shown and hidden rows, so both sets
     /// participate in the toolbar warning scope while this screen is open.
-    private var savedComputerPairingIDs: Set<String> {
-        Set(savedComputers.map(\.id) + (store?.hiddenComputers.map(\.id) ?? []))
+    private var savedComputerDeviceIDs: Set<String> {
+        Set(
+            savedComputers.map(\.deviceId)
+                + (store?.hiddenComputers.map(\.macDeviceID) ?? [])
+        )
     }
 
     @ViewBuilder
@@ -290,9 +293,9 @@ struct DisconnectedWorkspaceShellView: View {
         }
         #endif
         return L10n.string(
-            "mobile.v2.devices.emptyDescription",
-            defaultValue: "On your Mac, turn on Enable iOS pairing in cmux Settings. Select the same team on both devices and keep cmux running. Only Macs you own or have permission to connect to appear here."
-        )
+            "mobile.devices.emptyDescription",
+            defaultValue: "For Iroh to find a Mac, run cmux 0.64.20 or later on the Mac, sign in to cmux on both devices with the same account, and keep cmux running on the Mac while both devices are online. If any requirement is missing, the Mac will not appear automatically. To use Tailscale instead, open Settings, tap Connection Method, and choose Tailscale Only."
+        ) + " " + MobilePairingCopy().emptyWorkspaceMessage
     }
 
     /// Reconnect this row's computer. `switchToMac` promotes a live secondary
@@ -390,8 +393,8 @@ struct DisconnectedWorkspaceShellView: View {
             Text(
                 savedMacs.isEmpty
                     ? L10n.string(
-                        "mobile.v2.devices.emptyDescription",
-                        defaultValue: "On your Mac, turn on Enable iOS pairing in cmux Settings. Select the same team on both devices and keep cmux running. Only Macs you own or have permission to connect to appear here."
+                        "mobile.devices.emptyDescription",
+                        defaultValue: "For Iroh to find a Mac, run cmux 0.64.20 or later on the Mac, sign in to cmux on both devices with the same account, and keep cmux running on the Mac while both devices are online. If any requirement is missing, the Mac will not appear automatically. To use Tailscale instead, open Settings, tap Connection Method, and choose Tailscale Only."
                     )
                     : savedMacDescription
             )

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/MobilePairingCopy.swift

@@ -0,0 +1,26 @@
+#if os(iOS)
+import CmuxMobileSupport
+
+struct MobilePairingCopy {
+    var enableOnMacShort: String {
+        L10n.string(
+            "mobile.pairing.enableOnMac.short",
+            defaultValue: "Enable iOS pairing in cmux Settings > Mobile on your Mac."
+        )
+    }
+
+    var enableOnMac: String {
+        L10n.string(
+            "mobile.pairing.enableOnMac",
+            defaultValue: "Before pairing, open cmux Settings > Mobile on the Mac and turn on Enable iOS pairing. This Mac stays hidden from iOS while it is off."
+        )
+    }
+
+    var emptyWorkspaceMessage: String {
+        L10n.string(
+            "mobile.workspaces.empty.message",
+            defaultValue: "Enable iOS pairing in cmux Settings > Mobile on your Mac, sign in to the same cmux account on both devices, and keep cmux running. Your Mac and its workspaces will appear here after pairing is enabled."
+        )
+    }
+}
+#endif

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/MobilePairingScannerSheet.swift

@@ -230,13 +230,14 @@ extension MobilePairingScannerSheet {
 
     /// Tailscale setup guidance for an empty computer list, including the route back to Auto-Connect.
     static var emptyStateGuidanceText: String {
-        L10n.string(
+        let guidance = L10n.string(
             "mobile.tailscalePairing.emptyDescription",
             defaultValue: """
             Install Tailscale on both devices and use the same Tailscale network. Open Tailscale \
             Pairing on the Mac and scan its QR here, or enter the Mac's numeric Tailscale IP and port. \
             To use Auto-Connect instead, open Settings, tap Connection Method, and choose Auto-Connect.
             """
         )
+        return "\(guidance) \(MobilePairingCopy().emptyWorkspaceMessage)"
     }
 }

Packages/iOS/CmuxMobileShellUI/Sources/CmuxMobileShellUI/MobileSettingsView.swift

@@ -75,6 +75,10 @@ struct MobileSettingsView: View {
 
     var body: some View {
         @Bindable var displaySettings = displaySettings
+        #if DEBUG
+        let whatsNewPages = whatsNewCenter?.archivePages ?? MobileWhatsNewCatalog.channelVisibleEntries()
+        let whatsNewHosts = whatsNewCenter?.allowedWebHosts ?? []
+        #endif
         return NavigationStack {
             Form {
                 MobileSettingsAccountSection(signOut: signOut)
@@ -273,6 +277,15 @@ struct MobileSettingsView: View {
 
                 #if DEBUG
                 Section(L10n.string("mobile.settings.developer", defaultValue: "Developer")) {
+                    NavigationLink {
+                        MobileWhatsNewDebugView(pages: whatsNewPages, allowedWebHosts: whatsNewHosts)
+                    } label: {
+                        Label(
+                            L10n.string("mobile.whatsNew.debug.title", defaultValue: "Replay What's New"),
+                            systemImage: "rectangle.stack"
+                        )
+                    }
+                    .accessibilityIdentifier("MobileSettingsReplayWhatsNew")
                     Button {
                         showingToastGallery = true
                     } label: {