Scramble

Pre-push review: Scramble developer account migration

At a glance

  • App: me.nore.ig.apps.packing; CloudKit: iCloud.me.nore.ig.apps.packing.
  • All eight project/target team settings: 4PJS97G236. Display name Scramble and URL scheme unchanged.
  • No automated portal changes or data reset/copy.

Verdict

Migration reviewed; inherited UI failures

38 failing tests — full suite: 806 passed, 38 failed, 12 skipped. Compare exact selectors in failure-comparison.json. Independent reuse, quality/correctness and efficiency reviews found no migration blockers. User accepted basic device persistence; CloudKit cross-device sync is unverified.

Tests

Pass rate: 95% (806 of 844)

New tests: 0

Diff coverage: n/a

Jump to tests →

Three-level explanation

Scramble now uses a fresh app identity and cloud container under the selected developer account. Its visible name stays Scramble. Old app data is not copied. Basic device persistence passed according to the user.

The Xcode app/test bundle IDs, project/target teams, entitlements, runtime CloudKit constant, Makefile launch ID, URL type name, logger and test expectations agree. The harness reuses the runtime constant. A separate container selects a new backend; no persistence logic changes.

This is an identity boundary change rather than a SwiftData schema or CKSyncEngine algorithm migration. Existing sandbox/defaults and CloudKit data are not transferred. Simulator ad-hoc signing is not proof of portal ownership or cross-device sync. Completeness: local configuration and basic device persistence accepted; cross-account sharing and cross-device cloud round trips remain outside the verified scope.

Important changes — detailed

Align all signing identities

Scramble/Scramble.xcodeproj/project.pbxproj

Why it matters. Avoid mixed-team app/test provisioning.

What to look at. All eight XCBuildConfiguration team fields and six bundle identifiers.

Rationale. The user explicitly chose team 4PJS97G236 and a brand-independent packing identifier family.

Bind runtime and entitlement to the same container

Scramble/Scramble/Persistence/ModelStore.swift

Why it matters. Both CloudKit clients and SwiftData select the intended backend.

What to look at. ModelStore.cloudKitContainerIdentifier and Scramble.entitlements

Takeaway. An entitlement alone does not change the runtime container selector.

Document safe account migration order

docs/account-migration.md

Why it matters. Avoid automatic provisioning against a previous team.

What to look at. Migration workflow and validation/acceptance sections.

Rationale. Switch account/team immediately after worktree creation, before identifier edits/opening Xcode. Registration attribution remains explicitly unproven.

Tests

Source: local run at 2026-10-18T14:35:31.970557+00:00 · snapshot 2721508f1335fafd49034d54e68dc56bf0ceb390 (dirty working tree)

Baseline: none

Execution: failed · JUnit: 1 file · Coverage: none · Baseline: absent

Coverage scope: as the project configures it

Totals: 806 passed · 38 failed · 12 skipped · 0 errored · 0 flaky

Failed tests

SuiteTestJob or artifactMessage
ColdLaunchSequencingUITeststestColdLaunchScanCompletesBeforeAutoOpen()—Failed; see native xcresult and full-suite log
PackingSheetUITeststestAddManualItemAppearsInUnpacked()—Failed; see native xcresult and full-suite log
PackingSheetUITeststestInnerFormSwipeDownKeepsPackingSheet()—Failed; see native xcresult and full-suite log
PackingSheetUITeststestLeftBehindRowIsReadOnly()—Failed; see native xcresult and full-suite log
PackingSheetUITeststestPackingSummaryRendersInDayBeforePhase()—Failed; see native xcresult and full-suite log
PackingSheetUITeststestPackModeCheckboxTogglesState()—Failed; see native xcresult and full-suite log
PackingSheetUITeststestPhaseSublineCombined()—Failed; see native xcresult and full-suite log
PackingSheetUITeststestRenameViaSwipe()—Failed; see native xcresult and full-suite log
PackingSheetUITeststestRepackOpensFromDayBeforeReturn()—Failed; see native xcresult and full-suite log
PackingSheetUITeststestRestoreReverses()—Failed; see native xcresult and full-suite log
PackingSheetUITeststestSheetCounterIncludesDimmed()—Failed; see native xcresult and full-suite log
PackingSheetUITeststestSkipMovesItemToNotBringing()—Failed; see native xcresult and full-suite log
PackingSheetUITeststestTappingSummaryRowOpensSheet()—Failed; see native xcresult and full-suite log
PackingSubItemsUITeststestAddRemoveAndReadOnlySubItem()—Failed; see native xcresult and full-suite log
PersonDeletionGuardUITeststestPersonOwningMasterPackingItemCannotBeDeleted()—Failed; see native xcresult and full-suite log
Phase5MigrationStateUITeststestFailedMigrationRowAppearsInRetryBanner()—Failed; see native xcresult and full-suite log
Phase5MigrationStateUITeststestStageBInProgressTripShowsSyncingBadge()—Failed; see native xcresult and full-suite log
Phase5SharingUITeststestOwnerSideTapPresentsManageParticipantsAffordance()—Failed; see native xcresult and full-suite log
Phase5SharingUITeststestParticipantsSectionDisplayNameFallbackChain()—Failed; see native xcresult and full-suite log
Phase5SharingUITeststestParticipantsSectionDistinguishesPendingFromAccepted()—Failed; see native xcresult and full-suite log
Phase5SharingUITeststestParticipantsSectionIsReadOnlyForParticipants()—Failed; see native xcresult and full-suite log
Phase5SharingUITeststestShareButtonHiddenForParticipant()—Failed; see native xcresult and full-suite log
Phase5SharingUITeststestShareButtonVisibleForOwner()—Failed; see native xcresult and full-suite log
RootNavigationUITeststestAutoOpenDoesNotRefireOnTabSwitch()—Failed; see native xcresult and full-suite log
RootNavigationUITeststestColdLaunchOneQualifyingTripAutoOpensDetail()—Failed; see native xcresult and full-suite log
RootNavigationUITeststestTabBarHiddenOnDetailRestoredOnPop()—Failed; see native xcresult and full-suite log
RulesEnginePopulationUITeststestCreateTripPopulatesMatchingMasterPackingItem()—Failed; see native xcresult and full-suite log
RulesEnginePopulationUITeststestEditTripAttributesPopulatesMatchingMasterPackingItem()—Failed; see native xcresult and full-suite log
TimelineAndTaskUITeststestAccordionAutoExpandsCurrentPhase()—Failed; see native xcresult and full-suite log
TimelineAndTaskUITeststestAssigneePickerEmptyParticipants()—Failed; see native xcresult and full-suite log
TimelineAndTaskUITeststestCheckboxToggleAndStrikethrough()—Failed; see native xcresult and full-suite log
TimelineAndTaskUITeststestManualTaskAddPersistsAcrossLaunch()—Failed; see native xcresult and full-suite log
TimelineAndTaskUITeststestOnlyOnePhaseExpandedAtATime()—Failed; see native xcresult and full-suite log
TimelineAndTaskUITeststestRuleDeletionPersistsAcrossReevaluation()—Failed; see native xcresult and full-suite log
TimelineAndTaskUITeststestSwipeRevealsEditAndDelete()—Failed; see native xcresult and full-suite log
TripCRUDUITeststestDeleteTripRemovesItFromList()—Failed; see native xcresult and full-suite log
TripCRUDUITeststestEditTripAttributesUpdatesChips()—Failed; see native xcresult and full-suite log
TripEditorPickerReactivityUITeststestNewPersonCreatedInlineAppearsInPickerWithoutLeavingEditor()—Failed; see native xcresult and full-suite log

New and removed tests

Derived by declaration name, from the diff (no baseline run).

No new or removed test declarations.

Blast radius

Files that import a changed file on the left, changed files in the centre, files a changed file imports on the right. Snapshot working-tree against base 2721508f1335fafd49034d54e68dc56bf0ceb390.

addedmodifieddeletedrenamedunchangedcollapsed package group or +N more⚑N test files with an edge to the node

Per-file diffs

20 files: 8 code · 12 docs. Click to expand.

Code (8)

Makefile Modified
diff --git a/Makefile b/Makefileindex 8d676f8..72227ef 100644--- a/Makefile+++ b/Makefile@@ -3,7 +3,7 @@ SHELL = /bin/bash  SCHEME = Scramble PROJECT = Scramble/Scramble.xcodeproj-BUNDLE_ID = me.nore.ig.Scramble+BUNDLE_ID = me.nore.ig.apps.packing CONFIG ?= Debug  # Use make test with -only-testing for narrow selection. test-quick/test-ui
Scramble/Scramble.xcodeproj/project.pbxproj Modified
diff --git a/Scramble/Scramble.xcodeproj/project.pbxproj b/Scramble/Scramble.xcodeproj/project.pbxprojindex 5ea40c3..bf32b86 100644--- a/Scramble/Scramble.xcodeproj/project.pbxproj+++ b/Scramble/Scramble.xcodeproj/project.pbxproj@@ -290,7 +290,7 @@ 				CODE_SIGN_ENTITLEMENTS = Scramble/Scramble.entitlements; 				CODE_SIGN_STYLE = Automatic; 				CURRENT_PROJECT_VERSION = 1;-				DEVELOPMENT_TEAM = V24684SCZN;+				DEVELOPMENT_TEAM = 4PJS97G236; 				ENABLE_APP_SANDBOX = YES; 				ENABLE_HARDENED_RUNTIME = YES; 				ENABLE_PREVIEWS = YES;@@ -312,7 +312,7 @@ 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; 				MACOSX_DEPLOYMENT_TARGET = 26.4; 				MARKETING_VERSION = 1.0;-				PRODUCT_BUNDLE_IDENTIFIER = me.nore.ig.Scramble;+				PRODUCT_BUNDLE_IDENTIFIER = me.nore.ig.apps.packing; 				PRODUCT_NAME = "$(TARGET_NAME)"; 				REGISTER_APP_GROUPS = YES; 				SDKROOT = auto;@@ -337,7 +337,7 @@ 				CODE_SIGN_ENTITLEMENTS = Scramble/Scramble.entitlements; 				CODE_SIGN_STYLE = Automatic; 				CURRENT_PROJECT_VERSION = 1;-				DEVELOPMENT_TEAM = V24684SCZN;+				DEVELOPMENT_TEAM = 4PJS97G236; 				ENABLE_APP_SANDBOX = YES; 				ENABLE_HARDENED_RUNTIME = YES; 				ENABLE_PREVIEWS = YES;@@ -359,7 +359,7 @@ 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; 				MACOSX_DEPLOYMENT_TARGET = 26.4; 				MARKETING_VERSION = 1.0;-				PRODUCT_BUNDLE_IDENTIFIER = me.nore.ig.Scramble;+				PRODUCT_BUNDLE_IDENTIFIER = me.nore.ig.apps.packing; 				PRODUCT_NAME = "$(TARGET_NAME)"; 				REGISTER_APP_GROUPS = YES; 				SDKROOT = auto;@@ -411,7 +411,7 @@ 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 				COPY_PHASE_STRIP = NO; 				DEBUG_INFORMATION_FORMAT = dwarf;-				DEVELOPMENT_TEAM = V24684SCZN;+				DEVELOPMENT_TEAM = 4PJS97G236; 				ENABLE_STRICT_OBJC_MSGSEND = YES; 				ENABLE_TESTABILITY = YES; 				ENABLE_USER_SCRIPT_SANDBOXING = YES;@@ -473,7 +473,7 @@ 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 				COPY_PHASE_STRIP = NO; 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";-				DEVELOPMENT_TEAM = V24684SCZN;+				DEVELOPMENT_TEAM = 4PJS97G236; 				ENABLE_NS_ASSERTIONS = NO; 				ENABLE_STRICT_OBJC_MSGSEND = YES; 				ENABLE_USER_SCRIPT_SANDBOXING = YES;@@ -498,12 +498,12 @@ 				BUNDLE_LOADER = "$(TEST_HOST)"; 				CODE_SIGN_STYLE = Automatic; 				CURRENT_PROJECT_VERSION = 1;-				DEVELOPMENT_TEAM = V24684SCZN;+				DEVELOPMENT_TEAM = 4PJS97G236; 				GENERATE_INFOPLIST_FILE = YES; 				IPHONEOS_DEPLOYMENT_TARGET = 26.4; 				MACOSX_DEPLOYMENT_TARGET = 26.4; 				MARKETING_VERSION = 1.0;-				PRODUCT_BUNDLE_IDENTIFIER = me.nore.ig.ScrambleTests;+				PRODUCT_BUNDLE_IDENTIFIER = me.nore.ig.apps.packing.tests; 				PRODUCT_NAME = "$(TARGET_NAME)"; 				SDKROOT = auto; 				STRING_CATALOG_GENERATE_SYMBOLS = NO;@@ -524,12 +524,12 @@ 				BUNDLE_LOADER = "$(TEST_HOST)"; 				CODE_SIGN_STYLE = Automatic; 				CURRENT_PROJECT_VERSION = 1;-				DEVELOPMENT_TEAM = V24684SCZN;+				DEVELOPMENT_TEAM = 4PJS97G236; 				GENERATE_INFOPLIST_FILE = YES; 				IPHONEOS_DEPLOYMENT_TARGET = 26.4; 				MACOSX_DEPLOYMENT_TARGET = 26.4; 				MARKETING_VERSION = 1.0;-				PRODUCT_BUNDLE_IDENTIFIER = me.nore.ig.ScrambleTests;+				PRODUCT_BUNDLE_IDENTIFIER = me.nore.ig.apps.packing.tests; 				PRODUCT_NAME = "$(TARGET_NAME)"; 				SDKROOT = auto; 				STRING_CATALOG_GENERATE_SYMBOLS = NO;@@ -549,12 +549,12 @@ 			buildSettings = { 				CODE_SIGN_STYLE = Automatic; 				CURRENT_PROJECT_VERSION = 1;-				DEVELOPMENT_TEAM = V24684SCZN;+				DEVELOPMENT_TEAM = 4PJS97G236; 				GENERATE_INFOPLIST_FILE = YES; 				IPHONEOS_DEPLOYMENT_TARGET = 26.4; 				MACOSX_DEPLOYMENT_TARGET = 26.4; 				MARKETING_VERSION = 1.0;-				PRODUCT_BUNDLE_IDENTIFIER = me.nore.ig.ScrambleUITests;+				PRODUCT_BUNDLE_IDENTIFIER = me.nore.ig.apps.packing.uitests; 				PRODUCT_NAME = "$(TARGET_NAME)"; 				SDKROOT = auto; 				STRING_CATALOG_GENERATE_SYMBOLS = NO;@@ -574,12 +574,12 @@ 			buildSettings = { 				CODE_SIGN_STYLE = Automatic; 				CURRENT_PROJECT_VERSION = 1;-				DEVELOPMENT_TEAM = V24684SCZN;+				DEVELOPMENT_TEAM = 4PJS97G236; 				GENERATE_INFOPLIST_FILE = YES; 				IPHONEOS_DEPLOYMENT_TARGET = 26.4; 				MACOSX_DEPLOYMENT_TARGET = 26.4; 				MARKETING_VERSION = 1.0;-				PRODUCT_BUNDLE_IDENTIFIER = me.nore.ig.ScrambleUITests;+				PRODUCT_BUNDLE_IDENTIFIER = me.nore.ig.apps.packing.uitests; 				PRODUCT_NAME = "$(TARGET_NAME)"; 				SDKROOT = auto; 				STRING_CATALOG_GENERATE_SYMBOLS = NO;
Scramble/Scramble/Info.plist Modified
diff --git a/Scramble/Scramble/Info.plist b/Scramble/Scramble/Info.plistindex e98eca0..340a9df 100644--- a/Scramble/Scramble/Info.plist+++ b/Scramble/Scramble/Info.plist@@ -2,22 +2,22 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict>-	<key>UIBackgroundModes</key>-	<array>-		<string>remote-notification</string>-	</array> 	<key>CFBundleURLTypes</key> 	<array> 		<dict> 			<key>CFBundleTypeRole</key> 			<string>Editor</string> 			<key>CFBundleURLName</key>-			<string>me.nore.ig.Scramble</string>+			<string>me.nore.ig.apps.packing</string> 			<key>CFBundleURLSchemes</key> 			<array> 				<string>scramble</string> 			</array> 		</dict> 	</array>+	<key>UIBackgroundModes</key>+	<array>+		<string>remote-notification</string>+	</array> </dict> </plist>
Scramble/Scramble/Models/Schema.swift Modified
diff --git a/Scramble/Scramble/Models/Schema.swift b/Scramble/Scramble/Models/Schema.swiftindex b603ca8..1e821c0 100644--- a/Scramble/Scramble/Models/Schema.swift+++ b/Scramble/Scramble/Models/Schema.swift@@ -452,6 +452,6 @@ nonisolated enum AppMigrationPlan: SchemaMigrationPlan { // MARK: - Logger  nonisolated let modelLogger = Logger(-  subsystem: "me.nore.ig.Scramble",+  subsystem: "me.nore.ig.apps.packing",   category: "models" )
Scramble/Scramble/Persistence/ModelStore.swift Modified
diff --git a/Scramble/Scramble/Persistence/ModelStore.swift b/Scramble/Scramble/Persistence/ModelStore.swiftindex 57bfd02..4d6e703 100644--- a/Scramble/Scramble/Persistence/ModelStore.swift+++ b/Scramble/Scramble/Persistence/ModelStore.swift@@ -5,7 +5,7 @@ import os @MainActor enum ModelStore { -  nonisolated static let cloudKitContainerIdentifier = "iCloud.me.nore.ig.scramble"+  nonisolated static let cloudKitContainerIdentifier = "iCloud.me.nore.ig.apps.packing"    /// Phase 5 split (Decision 13). `globals` retains SwiftData's CloudKit   /// mirror for `Person` / master lists / migration journal; `tripsLocal`
Scramble/Scramble/Scramble.entitlements Modified
diff --git a/Scramble/Scramble/Scramble.entitlements b/Scramble/Scramble/Scramble.entitlementsindex 19303c6..4406132 100644--- a/Scramble/Scramble/Scramble.entitlements+++ b/Scramble/Scramble/Scramble.entitlements@@ -8,7 +8,7 @@ 	<string>development</string> 	<key>com.apple.developer.icloud-container-identifiers</key> 	<array>-		<string>iCloud.me.nore.ig.scramble</string>+		<string>iCloud.me.nore.ig.apps.packing</string> 	</array> 	<key>com.apple.developer.icloud-services</key> 	<array>
Scramble/ScrambleTests/Persistence/ModelStoreEnvironmentTests.swift Modified
diff --git a/Scramble/ScrambleTests/Persistence/ModelStoreEnvironmentTests.swift b/Scramble/ScrambleTests/Persistence/ModelStoreEnvironmentTests.swiftindex 622967c..85cd575 100644--- a/Scramble/ScrambleTests/Persistence/ModelStoreEnvironmentTests.swift+++ b/Scramble/ScrambleTests/Persistence/ModelStoreEnvironmentTests.swift@@ -45,7 +45,7 @@ struct ModelStoreEnvironmentTests {     let probe = EnvironmentProbe(environment: [:], arguments: [])     let config = ModelStore.configuration(probe: probe)     #expect(config.isStoredInMemoryOnly == false)-    #expect(config.cloudKitContainerIdentifier == "iCloud.me.nore.ig.scramble")+    #expect(config.cloudKitContainerIdentifier == "iCloud.me.nore.ig.apps.packing")   }    @Test("Probe branches: isTest")@@ -166,7 +166,7 @@ struct ModelStoreEnvironmentTests {     let probe = EnvironmentProbe(environment: [:], arguments: [])     let config = ModelStore.globalsConfiguration(probe: probe)     #expect(config.isStoredInMemoryOnly == false)-    #expect(config.cloudKitContainerIdentifier == "iCloud.me.nore.ig.scramble")+    #expect(config.cloudKitContainerIdentifier == "iCloud.me.nore.ig.apps.packing")   }    @Test("TripsLocal config: unit-test env → in-memory, no CloudKit")
Scramble/ScrambleTests/Sharing/CKSyncEngineValidationHarness.swift Modified
diff --git a/Scramble/ScrambleTests/Sharing/CKSyncEngineValidationHarness.swift b/Scramble/ScrambleTests/Sharing/CKSyncEngineValidationHarness.swiftindex 70f7e6b..be7ce7c 100644--- a/Scramble/ScrambleTests/Sharing/CKSyncEngineValidationHarness.swift+++ b/Scramble/ScrambleTests/Sharing/CKSyncEngineValidationHarness.swift@@ -28,7 +28,7 @@ import Testing /// against the development CloudKit container: /// /// 1. Sign the iOS Simulator (or your device) into an iCloud account that has access-///    to the development container `iCloud.me.nore.ig.scramble`.+///    to the development container `iCloud.me.nore.ig.apps.packing`. /// 2. ```bash ///    SCRAMBLE_CK_HARNESS=1 make test-quick ///    ```@@ -47,7 +47,7 @@ struct CKSyncEngineValidationHarnessSuite {     "Owner can create zone, upload record, and save zone-wide CKShare via CKSyncEngine"   )   func ownerSideLifecycle() async throws {-    let container = CKContainer(identifier: "iCloud.me.nore.ig.scramble")+    let container = CKContainer(identifier: ModelStore.cloudKitContainerIdentifier)      let accountStatus = try await container.accountStatus()     try #require(

Docs (12)

CHANGELOG.md Modified
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex b71dc9c..2aa669b 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -80,6 +80,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).  ### Changed +- Move Scramble's app/test identifiers to the `me.nore.ig.apps.packing` family and CloudKit to `iCloud.me.nore.ig.apps.packing` under team `4PJS97G236`. Keep the displayed app name and `scramble://` URL scheme unchanged; document the developer-account migration order and validation limits. This selects a separate app/container identity and does not copy existing data.+ - `task-row-text-alignment` (T-1619) — the trip-timeline task name is given a 44pt min-height so a single-line name sits vertically centred with its checkbox, matching the packing row's `nameColumn` (the same treatment added for packing in T-1587). One modifier on `Text(task.name)` in `TaskRow.swift` (`minHeight: 44`); the row-level 44pt tap-target frame, the inline `WhyDisclosure`, and the assignee avatar are unchanged. Multi-line names and large Dynamic Type still wrap top-aligned (a no-op fallback, consistent with the packing row).  - Pack-mode packing list moved from the **Departure day** phase to the **Day before** phase, so packing is prepared the day before departure (symmetric with repack on **Day before return**). The "is this a packing phase?" predicate and the phase→mode mapping are now centralised in a new `Phase.packingMode` computed property (single source of truth for `AccordionTimeline` and `TripDetailView.autoExpandPhase`); the summary block, packing-sheet entry, always-expandable gate, and the `PhaseNode` suitcase glyph all follow it onto `.dayBefore`. Departure day reverts to a plain task-only phase; on a 1-day trip the pack list lives on the prior day. The `phase4-pack-mode-trip` UI seed and the `AutoExpand` / `PhaseRow` / `PackingSheet` tests were updated, and `PhasePackingModeTests` pins the new mapping. Recorded as `specs/phase-4-packing-sheet/decision_log.md` Decision 11 (supersedes the Departure-day placement in the Phase 3/4 spec ACs); `CLAUDE.md`, `docs/scramble-ui-design-doc.md`, `docs/implementation-phases.md`, and `docs/agent-notes/packing-sheet.md` updated to match.
CLAUDE.md Modified
diff --git a/CLAUDE.md b/CLAUDE.mdindex 9c58f56..38b7669 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -6,7 +6,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co  Scramble is a native iOS app (macOS planned later) for trip planning, packing, and shared family coordination via CloudKit. Phases 1–6 have landed: SwiftData model + CloudKit-aware container, Theme system + Midnight Atlas variants, two-tab app shell, Trip CRUD with inline person creation, deterministic rules engine + Master Lists UI, timeline accordion + Trip-level Tasks, the per-person Packing Sheet with pack / repack modes (the long-press "why is this here?" explainability surface was removed from packing in phase-4 Decision 10 and removed entirely — task rows plus the Explainability subsystem — in T-1617; see `specs/remove-task-why-disclosure/`), Phase 5's CloudKit sharing infrastructure — `SchemaV3` with `TripPersonSnapshot` / `TripZoneState` / `MigrationJournalEntry`, dual SwiftData containers (globals + tripsLocal), Stage A + Stage B migration pipeline, `TripSyncEngine` over two `CKSyncEngine` instances, `CloudKitSharingService` + `UICloudSharingController` wrapper, the Share toolbar button and Trip Detail Participants section, silent-push routing, and the release-prep CloudKit-schema-promotion checklist. Phase 5.1 then routed Trip CRUD through `tripsLocal` so the sharing pipeline actually carries edits — container topology + chokepoint extension (`LocalWriteHook.commitDeletion`) + view-layer read/write conversion to `TripPersonSnapshot` + the 15-step `ZoneMigrationCoordinator` relocation algorithm with `TripSyncEventBus` multicast and `SignInResumeCoordinator` storm-collapse all landed. Phase 6 added local activation notifications (`Trip.countryCode` on `SchemaV3` — a post-Phase-6 bugfix collapsed the short-lived `SchemaV4` back into V3 because a property-only addition to a shared top-level class can't be a distinct schema version; see `persistence.md`, `NotificationIdentifier`/`NotificationPlanner`/`NotificationReconciler` pure primitives, `NotificationsService` orchestrator wired through `PendingChangeBroadcaster` over `LocalWriteHook`, `NotificationRouter` for taps + the `scramble://` URL scheme, `RootView` tap consumption), the deferred Trip Detail flag emoji, and the polish pass (shared `Animation.scrambleStandard`, haptics matrix, accessibility custom actions). See `specs/phase-1-foundation/` through `specs/phase-6-notifications-polish/` for what shipped and `docs/agent-notes/` (`persistence.md`, `rules-engine.md`, `packing-sheet.md`, `sync-infrastructure.md`, `phase-5-ui-surfaces.md`, `notifications.md`, `accessibility.md`) for load-bearing implementation notes. -Stack: iOS 26+, Swift 6.0 language mode (Xcode 26 toolchain), SwiftUI, SwiftData, CloudKit (CKShare for per-trip sharing). Bundle ID `me.nore.ig.Scramble`, CloudKit container `iCloud.me.nore.ig.scramble`. Project lives at `Scramble/Scramble.xcodeproj` (nested folder, standard Xcode layout).+Stack: iOS 26+, Swift 6.0 language mode (Xcode 26 toolchain), SwiftUI, SwiftData, CloudKit (CKShare for per-trip sharing). Bundle ID `me.nore.ig.apps.packing`, CloudKit container `iCloud.me.nore.ig.apps.packing`. Project lives at `Scramble/Scramble.xcodeproj` (nested folder, standard Xcode layout).  ## Build, test, run 
docs/agent-notes/persistence.md Modified
diff --git a/docs/agent-notes/persistence.md b/docs/agent-notes/persistence.mdindex e013546..f196302 100644--- a/docs/agent-notes/persistence.md+++ b/docs/agent-notes/persistence.md@@ -85,7 +85,7 @@ The probe is injectable; `ModelStore.configuration(probe:)` is `nonisolated` so | UI test host | launch arguments contain `-uitest` followed by `"1"` | | SwiftUI Previews | `environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1"` | -The first three branches return `isStoredInMemoryOnly: true, cloudKitDatabase: .none`. The fallthrough returns `cloudKitDatabase: .private("iCloud.me.nore.ig.scramble")`.+The first three branches return `isStoredInMemoryOnly: true, cloudKitDatabase: .none`. The fallthrough returns `cloudKitDatabase: .private("iCloud.me.nore.ig.apps.packing")`.  `ModelStore.shared` tries CloudKit; on throw, logs via `os_log(.error)` with the `[ModelStore.fallback]` marker and constructs a local-only fallback. If the fallback also throws, `fatalError`. The container is `@MainActor static let` (one-time evaluation at first access). 
docs/release-prep.md Modified
diff --git a/docs/release-prep.md b/docs/release-prep.mdindex a906e68..3e24ec1 100644--- a/docs/release-prep.md+++ b/docs/release-prep.md@@ -4,10 +4,12 @@ Pre-release work that has to land before any TestFlight or App Store submission. Items here are not enforceable from CI — keep them honest by walking the list every time. +For the developer-account namespace change, see [account-migration.md](account-migration.md).+ ## CloudKit  - [ ] **Promote the CloudKit schema from Development to Production.**-  Open the CloudKit Dashboard for container `iCloud.me.nore.ig.scramble`+  Open the CloudKit Dashboard for container `iCloud.me.nore.ig.apps.packing`   and promote every new record type and zone topology introduced by   `SchemaV3` (Phase 5 — Req   [13.1](../specs/phase-5-cloudkit-sharing/requirements.md#13.1) /
specs/packing-item-categories/prerequisites.md Modified
diff --git a/specs/packing-item-categories/prerequisites.md b/specs/packing-item-categories/prerequisites.mdindex 9f4e407..7ff52e4 100644--- a/specs/packing-item-categories/prerequisites.md+++ b/specs/packing-item-categories/prerequisites.md@@ -4,4 +4,4 @@ These steps require human action outside of code.  ## Before Release -- [ ] **Promote the CloudKit schema to Production** for the `iCloud.me.nore.ig.scramble` container, after the new fields exist in the Development environment. Promote the auto-mirrored `MasterPackingItem.category` (private database, created by the SwiftData CloudKit mirror) and the `TripPackingItem.category` field on the shared-zone record type. Local development and the test suite do not need this (Development auto-creates the schema), but a production release that ships category sync does. Tracked in the checklist updated by task 21 (`docs/release-prep.md`).+- [ ] **Promote the CloudKit schema to Production** for the `iCloud.me.nore.ig.apps.packing` container, after the new fields exist in the Development environment. Promote the auto-mirrored `MasterPackingItem.category` (private database, created by the SwiftData CloudKit mirror) and the `TripPackingItem.category` field on the shared-zone record type. Local development and the test suite do not need this (Development auto-creates the schema), but a production release that ships category sync does. Tracked in the checklist updated by task 21 (`docs/release-prep.md`).
specs/phase-1-foundation/implementation.md Modified
diff --git a/specs/phase-1-foundation/implementation.md b/specs/phase-1-foundation/implementation.mdindex 5e8777b..cb31d32 100644--- a/specs/phase-1-foundation/implementation.md+++ b/specs/phase-1-foundation/implementation.md@@ -78,7 +78,7 @@ configuration to use:   UI-test host (`-uitest 1` launch arg), or SwiftUI Previews   (`XCODE_RUNNING_FOR_PREVIEWS=1`) → in-memory container with   `cloudKitDatabase: .none`.-- Production → CloudKit `.private("iCloud.me.nore.ig.scramble")`. If that+- Production → CloudKit `.private("iCloud.me.nore.ig.apps.packing")`. If that   throws, fall back to local-only at the default location and `os_log` the   failure with a `[ModelStore.fallback]` marker. @@ -275,7 +275,7 @@ Each requirement (1.1–10.3) mapped to its implementation. Status legend:  | AC | Status | Notes | |---|---|---|-| 2.1 | ✅ | `cloudKitDatabase: .private("iCloud.me.nore.ig.scramble")` in production. |+| 2.1 | ✅ | `cloudKitDatabase: .private("iCloud.me.nore.ig.apps.packing")` in production. | | 2.2 | ✅ | `EnvironmentProbe` branches to `.none` for tests, UI test host, and Previews. `ModelStoreEnvironmentTests` cover each branch; `AppLaunchUITests.testLaunchUsesInMemoryContainer` covers the host-app side. | | 2.3 | ✅ | CloudKit construction wrapped in `do { try } catch { ... fall through to local-only }` with `os_log(.error)` `[ModelStore.fallback]` marker. Local fallback `fatalError`s only if it too throws. | | 2.4 | ✅ | Injected via `.modelContainer(ModelStore.shared)` in `ScrambleApp.body`. |
specs/phase-1-foundation/requirements.md Modified
diff --git a/specs/phase-1-foundation/requirements.md b/specs/phase-1-foundation/requirements.mdindex 49e6352..f59daf7 100644--- a/specs/phase-1-foundation/requirements.md+++ b/specs/phase-1-foundation/requirements.md@@ -47,7 +47,7 @@ Phase 1 establishes the foundation that every later phase of Scramble depends on  **Acceptance Criteria:** -1. <a name="2.1"></a>The production `ModelContainer` SHALL be configured with `cloudKitDatabase: .private("iCloud.me.nore.ig.scramble")`. All Phase 1 entities use the default SwiftData CloudKit zone (per-trip custom zones are deferred to the `CKShare` phase — see `decision_log.md` Decision 9).  +1. <a name="2.1"></a>The production `ModelContainer` SHALL be configured with `cloudKitDatabase: .private("iCloud.me.nore.ig.apps.packing")`. All Phase 1 entities use the default SwiftData CloudKit zone (per-trip custom zones are deferred to the `CKShare` phase — see `decision_log.md` Decision 9). 2. <a name="2.2"></a>WHEN the app is running under unit tests, UI tests, or SwiftUI Previews, the system SHALL use an in-memory `ModelContainer` with `cloudKitDatabase: .none`. The mechanism for detecting these contexts is a design decision, but the contract is observable: no CloudKit mirroring is attempted in any of these contexts.   3. <a name="2.3"></a>WHEN production container construction fails (missing entitlements, sandbox blocking, or other I/O error), the system SHALL silently fall back to a local-only `ModelContainer` (no CloudKit) at the default location and log the failure. The app SHALL NOT terminate before the first frame and SHALL NOT block the UI on an error screen.   4. <a name="2.4"></a>The model container SHALL be exposed as a single shared instance accessible to the SwiftUI view tree via the standard `.modelContainer(_:)` modifier.
specs/phase-1-foundation/tasks.md Modified
diff --git a/specs/phase-1-foundation/tasks.md b/specs/phase-1-foundation/tasks.mdindex d983a33..9a3e17a 100644--- a/specs/phase-1-foundation/tasks.md+++ b/specs/phase-1-foundation/tasks.md@@ -98,7 +98,7 @@ references:   - ModelStore.shared is @MainActor static let; production tries CloudKit .private then silently falls back to local-only on throw, logging via os_log(.error) with a distinctive marker string.   - Detection: XCTestConfigurationFilePath env var, -uitest 1 arg, XCODE_RUNNING_FOR_PREVIEWS env var.   - Three branches return in-memory container (cloudKitDatabase:.none) per design.md.-  - Production CloudKit container uses .private('iCloud.me.nore.ig.scramble') with SchemaV1 + AppMigrationPlan.+  - Production CloudKit container uses .private('iCloud.me.nore.ig.apps.packing') with SchemaV1 + AppMigrationPlan.   - Local fallback uses default location, .none database; if local fallback also throws → fatalError.   - Blocked-by: 1n8gan9 (Tests: ModelStore EnvironmentProbe selector branches)   - Stream: 1
specs/phase-5-cloudkit-sharing/design.md Modified
diff --git a/specs/phase-5-cloudkit-sharing/design.md b/specs/phase-5-cloudkit-sharing/design.mdindex cbc5396..4b907b7 100644--- a/specs/phase-5-cloudkit-sharing/design.md+++ b/specs/phase-5-cloudkit-sharing/design.md@@ -32,7 +32,7 @@ Two SwiftData containers, both `@MainActor`-mounted at app start:  | Container | `cloudKitDatabase` | Holds | |---|---|---|-| `globals` | `.private("iCloud.me.nore.ig.scramble")` | `Person`, `MasterTaskItem`, `MasterPackingItem`, `MigrationJournalEntry` |+| `globals` | `.private("iCloud.me.nore.ig.apps.packing")` | `Person`, `MasterTaskItem`, `MasterPackingItem`, `MigrationJournalEntry` | | `tripsLocal` | `.none` | `Trip`, `TripTask`, `TripPackingItem`, `TripPersonSnapshot`, `TripZoneState` |  `globals` continues to use SwiftData's CloudKit mirror — no sharing, just per-user private sync. `tripsLocal` is the local cache for everything sharable; cloud sync is driven by `TripSyncEngine` (below), not by SwiftData's mirror.
specs/phase-5-cloudkit-sharing/implementation.md Modified
diff --git a/specs/phase-5-cloudkit-sharing/implementation.md b/specs/phase-5-cloudkit-sharing/implementation.mdindex 2b04221..106772b 100644--- a/specs/phase-5-cloudkit-sharing/implementation.md+++ b/specs/phase-5-cloudkit-sharing/implementation.md@@ -32,7 +32,7 @@ Phase 5 began with a plan to mount one `ModelContainer` per trip zone (Decision  `ModelStore.makeContainers(probe:)` (Scramble/Scramble/Persistence/ModelStore.swift:73) returns two `ModelContainer`s: -- **`globals`** — `cloudKitDatabase: .private("iCloud.me.nore.ig.scramble")`. Holds `Person`, `MasterTaskItem`, `MasterPackingItem`, and `MigrationJournalEntry`. Continues to use SwiftData's CloudKit mirror — never participates in any share.+- **`globals`** — `cloudKitDatabase: .private("iCloud.me.nore.ig.apps.packing")`. Holds `Person`, `MasterTaskItem`, `MasterPackingItem`, and `MigrationJournalEntry`. Continues to use SwiftData's CloudKit mirror — never participates in any share. - **`tripsLocal`** — `cloudKitDatabase: .none`, stored separately at `~/Library/Application Support/Scramble/TripsLocal.store`. Holds `Trip`, `TripTask`, `TripPackingItem`, `TripPersonSnapshot`, `TripZoneState`. Sync is driven by `TripSyncEngine`, not SwiftData.  Both containers use `SchemaV3` (Scramble/Scramble/Models/Schema.swift:89). The deprecated V2 relationships (`Trip.participants → Person`, `TripPackingItem.person → Person`) are kept until V4 cleanup; new V3 fields (`participantSnapshots`, `tripZoneID`, `personSnapshot`, plus `ckRecordSystemFields` on the three trip-zone entities) are additive.
specs/phase-5-cloudkit-sharing/prerequisites.md Modified
diff --git a/specs/phase-5-cloudkit-sharing/prerequisites.md b/specs/phase-5-cloudkit-sharing/prerequisites.mdindex 2414a03..acfc87c 100644--- a/specs/phase-5-cloudkit-sharing/prerequisites.md+++ b/specs/phase-5-cloudkit-sharing/prerequisites.md@@ -4,7 +4,7 @@ These tasks must be completed by the user before or during implementation.  ## Before Starting -- [ ] Verify the Xcode project has the iCloud capability enabled with the CloudKit service ticked and the container `iCloud.me.nore.ig.scramble` selected (already required since Phase 1; confirm it is still configured)+- [ ] Verify the Xcode project has the iCloud capability enabled with the CloudKit service ticked and the container `iCloud.me.nore.ig.apps.packing` selected (already required since Phase 1; confirm it is still configured) - [ ] Verify the Xcode project has the Push Notifications capability enabled (required for silent CKSyncEngine push delivery) - [ ] Verify the Xcode project has the Background Modes capability enabled with the "Remote notifications" mode ticked - [ ] Confirm the Apple Developer Provisioning Profile for the app includes the `aps-environment` entitlement (development for debug builds, production for TestFlight/App Store)
docs/account-migration.md Added
diff --git a/docs/account-migration.md b/docs/account-migration.mdnew file mode 100644index 0000000..4e8249e--- /dev/null+++ b/docs/account-migration.md@@ -0,0 +1,98 @@+# Developer account migration branch++This branch prepares the namespace change from `me.nore.ig` to+`me.nore.ig.apps`. It does not transfer an App Store app, copy existing data,+provision a developer account, or migrate CloudKit records.++## Identifier inventory++| Resource | Previous | Prepared identifier |+| --- | --- | --- |+| App (Debug and Release) | `me.nore.ig.Scramble` | `me.nore.ig.apps.packing` |+| Unit tests (Debug and Release) | `me.nore.ig.ScrambleTests` | `me.nore.ig.apps.packing.tests` |+| UI tests (Debug and Release) | `me.nore.ig.ScrambleUITests` | `me.nore.ig.apps.packing.uitests` |+| CloudKit entitlement and runtime selector | `iCloud.me.nore.ig.scramble` | `iCloud.me.nore.ig.apps.packing` |+| URL type name and logging subsystem | `me.nore.ig.Scramble` | `me.nore.ig.apps.packing` |++The `scramble://` URL scheme is unchanged. There are no extension targets,+App Groups, keychain access groups, or ubiquity key-value store identifiers+configured in this project. The Makefile launch bundle ID and container test+expectations use the prepared namespace. Historical changelog entries retain+the identifiers that shipped at the time.++## Migration workflow and Xcode setup++For future account migrations, change the developer account/team in project and+all target configurations **immediately after creating the worktree, before+changing identifiers or opening the project in Xcode**. Make that first change+in the project file while Xcode is closed. Then change identifiers and open the+project to verify the intended team. This avoids automatic provisioning against+the old account while preparing a new namespace.++In this migration, cached profiles created after the simulator validation linked+`iCloud.me.nore.ig.apps.scramble` to the old team. The user considers opening+Xcode the likely trigger; this remains an inference, not proven attribution.+The user subsequently reported the proposed app identifier was unavailable too.+The approved identifier family is now `me.nore.ig.apps.packing`, with CloudKit+container `iCloud.me.nore.ig.apps.packing`. The displayed app name remains Scramble.+No registration or removal of the previous container is part of these edits.++1. Open this worktree's `Scramble/Scramble.xcodeproj`. The project-level and all+   target Debug/Release configurations now specify the user-selected team+   `4PJS97G236`. Signing remains Automatic. Confirm Xcode shows that team for+   `Scramble`, `ScrambleTests`, and `ScrambleUITests`.+2. For the app's iCloud capability, confirm CloudKit is enabled and select+   `iCloud.me.nore.ig.apps.packing` under that team. Confirm the app's+   Push Notifications capability and remote-notification background mode.+   A missing container or provisioning error needs the intended team's+   account owner to configure/authorize the corresponding resources. The+   local edits alone do not create them or establish identifier availability.+3. Review any signing changes Xcode proposes before allowing provisioning.+   Device installation and cloud acceptance are separate validation steps.+   The opt-in `SCRAMBLE_CK_HARNESS` performs cloud writes and must only be run+   deliberately after the account and development container are ready.++Changing the bundle ID gives the app a separate sandbox/defaults identity on+a device; existing installations are not upgraded in place by this ID. The+new CloudKit container is a distinct backend. No fallback to the old container+or data-copy/reset behavior has been added. Do not interpret local build or+synthetic test success as evidence of new-team signing or CloudKit access.++See [release-prep.md](release-prep.md) for the later schema deployment checklist.+That checklist is not authorization to promote a schema during local testing.++## Validation and acceptance++- Release iOS 27 simulator build passed. Its app reports bundle identifier+  `me.nore.ig.apps.packing`, displayed name Scramble, and the expected CloudKit+  simulated entitlement. Debug app and both test bundles report the identifiers+  in the inventory.+- Focused `ModelStoreEnvironmentTests`: 20 passed. Strict lint: zero violations+  in 228 files. Project/entitlement plist checks and all-eight-team settings+  validation passed.+- The user reported a successful physical-device check on the new account:+  create a trip, tick a packing item, close and reopen, and verify persistence.+  This is user-reported basic persistence acceptance, not independently verified+  CloudKit synchronisation between devices.+- Simulator build/test invocations omit provisioning-update and device-registration+  flags. Automation did not create or change developer portal resources. No data+  copy, deletion, reset or fallback to the previous container was implemented.++Device provisioning and container setup were handled by the user. Future releases+still require the [CloudKit schema deployment checklist](release-prep.md).++## Pre-merge verification++The required full simulator suite completed with **806 passed, 38 failed and+12 skipped** (856 declarations). All 38 failures exactly match the pre-existing+UI selector list in [T-2459 verification](../specs/bugfixes/trips-disappear-packing/verification.md);+none is new in this migration. All unit suites passed, including the changed+configuration expectations. The repeated packing/foreground lifecycle regression+also passed under the new bundle identifier. Failing tests were not weakened.++Xcode stalled gathering optional simulator diagnostics after native tests completed.+Only this run's diagnostic collector was stopped; xcodebuild then finalised a+readable xcresult with the exact totals above and exited 65 for the UI failures.+No tests were interrupted. Strict lint, changed-Swift formatting checks, plist+validation, identifier/team inventory and `git diff --check` passed. Verification+did not change any tracked source file. The full suite was run once.