🧪 Harden Swift beta tester readiness

apps/swift/Sources/PackRat/Features/Packs/PacksListView.swift

@@ -27,7 +27,7 @@ struct PacksListView: View {
 
     var body: some View {
         Group {
-            if viewModel.isLoading && viewModel.packs.isEmpty && !isExplore {
+            if viewModel.isLoading && viewModel.packs.isEmpty && !viewModel.isCacheLoaded && !isExplore {
                 ProgressView("Loading packs…").frame(maxWidth: .infinity, maxHeight: .infinity)
             } else if let error = viewModel.error, viewModel.packs.isEmpty, !isExplore {
                 ErrorView(error, retry: { await viewModel.load(context: modelContext) })
@@ -64,7 +64,6 @@ struct PacksListView: View {
                     Button("New Pack", systemImage: "plus") { showingCreateSheet = true }
                         .accessibilityIdentifier("packs_new_pack_button")
                         .keyboardShortcut("n", modifiers: .command)
-                        .accessibilityIdentifier("new_pack_button")
                 }
                 if viewModel.isLoading || isLoadingPublic {
                     ProgressView().controlSize(.small)

apps/swift/Sources/PackRat/Features/Packs/PacksViewModel.swift

@@ -54,8 +54,8 @@ final class PacksViewModel {
             let cachedPacks = cached.compactMap { $0.toPack() }
             if !cachedPacks.isEmpty {
                 packs = cachedPacks
-                isCacheLoaded = true
             }
+            isCacheLoaded = true
         }
 
         isLoading = packs.isEmpty

apps/swift/Sources/PackRat/Features/Trips/TripsListView.swift

@@ -16,7 +16,7 @@ struct TripsListView: View {
 
     var body: some View {
         Group {
-            if viewModel.isLoading && viewModel.trips.isEmpty {
+            if viewModel.isLoading && viewModel.trips.isEmpty && !viewModel.isCacheLoaded {
                 ProgressView("Loading trips…").frame(maxWidth: .infinity, maxHeight: .infinity)
             } else if let error = viewModel.error, viewModel.trips.isEmpty {
                 ErrorView(error, retry: { await viewModel.load(context: modelContext) })
@@ -42,7 +42,6 @@ struct TripsListView: View {
                 Button("Plan Trip", systemImage: "plus") { showingCreateSheet = true }
                     .accessibilityIdentifier("trips_plan_trip_button")
                     .keyboardShortcut("n", modifiers: [.command, .shift])
-                    .accessibilityIdentifier("plan_trip_button")
             }
         }
         .task { await viewModel.load(context: modelContext) }

apps/swift/Sources/PackRat/Features/Trips/TripsViewModel.swift

@@ -66,8 +66,8 @@ final class TripsViewModel {
             let cachedTrips = cached.compactMap { $0.toTrip() }
             if !cachedTrips.isEmpty {
                 trips = cachedTrips
-                isCacheLoaded = true
             }
+            isCacheLoaded = true
         }
 
         isLoading = trips.isEmpty

apps/swift/Sources/PackRat/PackRatApp.swift

@@ -12,6 +12,10 @@ struct PackRatApp: App {
     #endif
 
     init() {
+        // Telemetry has to start before any view is mounted so launch-time
+        // errors are captured. A missing DSN silently disables the SDK.
+        SentryConfig.start()
+
         #if os(macOS)
         if ProcessInfo.processInfo.arguments.contains("--reset-auth") {
             UserDefaults.standard.set(true, forKey: "ApplePersistenceIgnoreState")
@@ -20,12 +24,6 @@ struct PackRatApp: App {
         #endif
     }
 
-    init() {
-        // Telemetry has to start before any view is mounted so launch-time
-        // errors are captured. A missing DSN silently disables the SDK.
-        SentryConfig.start()
-    }
-
     var body: some Scene {
         WindowGroup {
             AuthGateView()

apps/swift/Sources/PackRat/Persistence/PersistenceController.swift

@@ -11,6 +11,10 @@ final class PersistenceController {
         let schema = Schema([CachedPack.self, CachedTrip.self, ShoppingItem.self])
         let config = ModelConfiguration("PackRat", schema: schema)
         do {
+            try FileManager.default.createDirectory(
+                at: FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask)[0],
+                withIntermediateDirectories: true
+            )
             container = try ModelContainer(for: schema, configurations: config)
         } catch {
             fatalError("SwiftData container failed: \(error)")

apps/swift/Tests/PackRatUITests/HomeTileTests.swift

@@ -22,19 +22,19 @@ final class HomeTileTests: AppUITestCase {
 
     func testEveryHomeNavigationTileOpensDestination() {
         for tile in navigationTiles {
-            goToTab("Home")
+            goHome()
             tapHomeTile(tile.id)
 
             guard let destinationTitle = tile.destinationTitle else { continue }
             XCTAssertTrue(
-                app.navigationBars[destinationTitle].waitForExistence(timeout: 8),
+                destinationExists(destinationTitle, timeout: 8),
                 "\(tile.id) must open \(destinationTitle)"
             )
         }
     }
 
     func testSeasonSuggestionsTileOpensAndDismissesSheet() {
-        goToTab("Home")
+        goHome()
         tapHomeTile("home_tile_season_suggestions")
 
         XCTAssertTrue(
@@ -46,7 +46,7 @@ final class HomeTileTests: AppUITestCase {
     }
 
     func testShoppingListTileSupportsAddToggleClearAndDone() {
-        goToTab("Home")
+        goHome()
         tapHomeTile("home_tile_shopping_list")
 
         XCTAssertTrue(
@@ -86,7 +86,24 @@ final class HomeTileTests: AppUITestCase {
         )
 
         waitFor(app.buttons["shopping_done"], timeout: 5).tap()
-        XCTAssertTrue(app.navigationBars["Home"].waitForExistence(timeout: 5))
+        XCTAssertTrue(destinationExists("Home", timeout: 5))
+    }
+
+    private func goHome() {
+        #if os(macOS)
+        goToSidebar("Home")
+        #else
+        goToTab("Home")
+        #endif
+    }
+
+    private func destinationExists(_ title: String, timeout: TimeInterval) -> Bool {
+        #if os(macOS)
+        return app.staticTexts[title].waitForExistence(timeout: timeout)
+            || app.navigationBars[title].waitForExistence(timeout: 1)
+        #else
+        return app.navigationBars[title].waitForExistence(timeout: timeout)
+        #endif
     }
 
     private func tapHomeTile(_ id: String) {

apps/swift/Tests/PackRatUITests/ScreenshotSmokeTests.swift

@@ -9,11 +9,11 @@ final class ScreenshotSmokeTests: AppUITestCase {
     func testCaptureCoreScreens() throws {
         capture("02-home")
 
-        goToTab("Packs")
+        goToDestination("Packs")
         XCTAssertTrue(app.navigationBars["Packs"].waitForExistence(timeout: 8))
         capture("03-packs")
 
-        goToTab("Weather")
+        goToDestination("Weather")
         XCTAssertTrue(app.navigationBars["Weather"].waitForExistence(timeout: 8))
         let searchField = app.textFields["Search locations..."].exists
             ? app.textFields["Search locations..."]
@@ -40,4 +40,12 @@ final class ScreenshotSmokeTests: AppUITestCase {
         attachment.lifetime = .keepAlways
         add(attachment)
     }
+
+    private func goToDestination(_ label: String) {
+        #if os(macOS)
+        goToSidebar(label)
+        #else
+        goToTab(label)
+        #endif
+    }
 }

apps/swift/Tests/PackRatUITests/VisualScreenshotTests.swift

@@ -583,10 +583,26 @@ final class VisualScreenshotTests: XCTestCase {
         openHomeForActionBaseline(name: baselineName)
 
         let identifier = "home_action_\(title.lowercased().filter { $0.isLetter || $0.isNumber })"
+        if prefersHomeSearch(for: title) {
+            openHomeActionUsingSearch(title: title, identifier: identifier)
+            if let destinationIdentifier {
+                let destination = app.descendants(matching: .any).matching(identifier: destinationIdentifier).firstMatch
+                XCTAssertTrue(
+                    destination.waitForExistence(timeout: 5),
+                    "Expected Home action '\(title)' to open '\(destinationIdentifier)' for screenshot \(name)"
+                )
+            }
+            capture(name)
+            if dismissAfterCapture {
+                dismissPhoneDestination()
+            }
+            return
+        }
+
         let action = app.buttons[identifier]
         var visibleCandidate: XCUIElement?
 
-        for _ in 0..<30 {
+        for _ in 0..<8 {
             if action.exists {
                 visibleCandidate = action
             }
@@ -641,6 +657,17 @@ final class VisualScreenshotTests: XCTestCase {
         }
     }
 
+    private func prefersHomeSearch(for title: String) -> Bool {
+        [
+            "AI Packs",
+            "Community Feed",
+            "Gear Inventory",
+            "Pack Templates",
+            "Trail Conditions",
+            "Wildlife ID",
+        ].contains(title)
+    }
+
     private func openHomeActionUsingSearch(title: String, identifier: String) {
         resetActiveHomeSearchPresentation()
 
@@ -1039,6 +1066,7 @@ final class VisualScreenshotTests: XCTestCase {
     ) {
         let element = app.descendants(matching: .any).matching(identifier: identifier).firstMatch
         XCTAssertTrue(element.waitForExistence(timeout: 5), "Expected element identifier '\(identifier)' for screenshot \(name)")
+        XCTAssertTrue(element.isHittable, "Expected element identifier '\(identifier)' to be hittable for screenshot \(name)")
         activate(element)
         capture(name)
         if dismissAfterCapture {
@@ -1048,7 +1076,7 @@ final class VisualScreenshotTests: XCTestCase {
 
     private func scrollToElement(identifier: String, maxSwipes: Int = 5) {
         let element = app.descendants(matching: .any).matching(identifier: identifier).firstMatch
-        for _ in 0..<maxSwipes where !element.exists {
+        for _ in 0..<maxSwipes where !element.exists || !element.isHittable {
             app.swipeUp()
         }
     }
@@ -1060,7 +1088,7 @@ final class VisualScreenshotTests: XCTestCase {
         }
         activate(button)
         capture(name)
-        dismissPresentedSurface()
+        dismissTransientOverlay()
     }
 
     private func openContextMenuAndCapture(identifier: String, name: String) {
@@ -1072,15 +1100,15 @@ final class VisualScreenshotTests: XCTestCase {
         element.press(forDuration: 1)
         #endif
         capture(name)
-        dismissPresentedSurface()
+        dismissTransientOverlay()
     }
 
     private func tapAndCapture(identifier: String, name: String) {
-        guard let button = findButton(identifier: identifier, timeout: 3) else {
-            XCTFail("Expected button identifier '\(identifier)' for screenshot \(name)")
+        guard let element = findElement(identifier: identifier, timeout: 3) else {
+            XCTFail("Expected tappable element identifier '\(identifier)' for screenshot \(name)")
             return
         }
-        activate(button)
+        activate(element)
         capture(name)
         dismissPresentedSurface()
     }
@@ -1091,12 +1119,12 @@ final class VisualScreenshotTests: XCTestCase {
         name: String,
         dismissAfterCapture: Bool = true
     ) {
-        let button = findButton(identifier: identifier, timeout: 1) ?? findButton(label: label, timeout: 3)
-        guard let button else {
-            XCTFail("Expected button identifier '\(identifier)' or label '\(label)' for screenshot \(name)")
+        let element = findElement(identifier: identifier, timeout: 1) ?? findButton(label: label, timeout: 3)
+        guard let element else {
+            XCTFail("Expected tappable element identifier '\(identifier)' or button label '\(label)' for screenshot \(name)")
             return
         }
-        activate(button)
+        activate(element)
         capture(name)
         if dismissAfterCapture {
             dismissPresentedSurface()
@@ -1120,6 +1148,11 @@ final class VisualScreenshotTests: XCTestCase {
         return findConcreteElement(in: query, timeout: timeout)
     }
 
+    private func findElement(identifier: String, timeout: TimeInterval) -> XCUIElement? {
+        let query = app.descendants(matching: .any).matching(identifier: identifier)
+        return findConcreteElement(in: query, timeout: timeout)
+    }
+
     private func findConcreteElement(in query: XCUIElementQuery, timeout: TimeInterval) -> XCUIElement? {
         guard query.firstMatch.waitForExistence(timeout: timeout) else { return nil }
         for element in query.allElementsBoundByIndex where element.exists && element.isHittable {
@@ -1166,6 +1199,14 @@ final class VisualScreenshotTests: XCTestCase {
         #endif
     }
 
+    private func dismissTransientOverlay() {
+        #if os(macOS)
+        app.typeKey(XCUIKeyboardKey.escape.rawValue, modifierFlags: [])
+        #else
+        app.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.22)).tap()
+        #endif
+    }
+
     private func launchAuthenticated(sampleData: Bool = false, forceOffline: Bool = false) {
         let bundle = Bundle(for: VisualScreenshotTests.self)
         let email = (bundle.object(forInfoDictionaryKey: "PACKRAT_E2E_EMAIL") as? String)
@@ -1325,13 +1366,10 @@ final class VisualScreenshotTests: XCTestCase {
     private func dismissInterruption(in container: XCUIElement) -> Bool {
         #if os(macOS)
         for label in ["Remind Me Later", "Not Now", "Continue", "OK", "Allow", "Dismiss", "Close"] {
-            let button = container.buttons[label]
-            if button.exists {
-                if button.isHittable {
-                    button.click()
-                } else {
-                    button.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.5)).click()
-                }
+            let matchingButtons = container.buttons.allElementsBoundByIndex
+                .filter { $0.label == label || $0.identifier == label }
+            if let button = matchingButtons.first(where: { $0.exists && $0.isHittable }) ?? matchingButtons.first(where: { $0.exists }) {
+                button.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.5)).click()
                 return true
             }
         }

apps/swift/scripts/__tests__/args.test.ts

@@ -23,6 +23,20 @@ describe('parseArgs', () => {
     expect(parseArgs(['--plan=smoke']).plan).toBe('iOS-Smoke');
   });
 
+  it('accepts legacy positional iOS mode aliases used by package scripts', () => {
+    expect(parseArgs(['ios-ui'])).toEqual({ plan: 'iOS-Full', passthrough: [] });
+    expect(parseArgs(['ios-smoke'])).toEqual({ plan: 'iOS-Smoke', passthrough: [] });
+  });
+
+  it('maps unit mode to the iOS unit test target instead of an xcodebuild action', () => {
+    expect(parseArgs(['unit'])).toEqual({
+      passthrough: ['-only-testing:PackRatTests'],
+    });
+    expect(parseArgs(['ios-unit'])).toEqual({
+      passthrough: ['-only-testing:PackRatTests'],
+    });
+  });
+
   it('case-insensitive alias matching', () => {
     expect(parseArgs(['--plan', 'SMOKE']).plan).toBe('iOS-Smoke');
     expect(parseArgs(['--plan', 'FULL']).plan).toBe('iOS-Full');