Swift 6 mode + off-main batch import (crash fix) + CI parity overhaul

Swift 6 language mode (SWIFT_VERSION 6.0, all targets):
- Pure data layers opted out of the default MainActor isolation with native
  `nonisolated`: Constants enums, JSON blob helpers, Color hex math, the whole
  Bible import parse layer (importers, rich-text/GBF/USFM helpers, value types).
- Fresh importer instance per import (the shared XML importer instances with
  mutable parser state were a latent data race).
- SE-0371 `isolated deinit` for MainActor teardown (audio timer, screen
  observers, command router tokens, video observers/security scope).
- VersionedSchema identifiers are `let`; test suites annotated @mainactor.

Batch Bible import crash (SIGABRT malloc_zone_error on Thread 3):
- New BackgroundImportActor (@Modelactor) — batch imports run entirely off the
  main actor on its OWN serialized ModelContext; the view's context no longer
  crosses thread hops mid-import.
- ImportService.importBible is nonisolated(nonsending) — runs on the caller's
  isolation, saves per BOOK (chunked) inside autoreleasepool, progress hops to
  the main actor via @mainactor @sendable handler.
- BatchImportSheet: re-entry guard + per-run status reset (fixes the glitched
  reopened sheet); bibles route through the actor.

CI/CD parity + modernization:
- Runner macos-26 + Xcode 26.3 (17C529) — EXACT match with the dev Mac; the old
  macos-15/Xcode 16.0 pair ignored the project's Swift-6-era settings.
- All actions on current majors (checkout v7, upload-artifact v7,
  download-artifact v8, configure-pages v6, upload-pages-artifact v5,
  deploy-pages v5, gh-release v3) — no more Node 20 deprecation warnings.
- Unit tests are a real gate (removed `|| true`; -only-testing unit suite).
- Uniform inside-out ad-hoc re-sign of Sparkle (XPCs, Autoupdate, Updater.app,
  framework) + the app, preserving entitlements, then strict codesign verify —
  fixes the DYLD "different Team IDs" launch crash on other Macs.
- Pages config cleaned (dangling deleted-branch source removed).

Author: RobyRew

.github/workflows/build-and-release.yml

@@ -15,27 +15,34 @@ concurrency:
 env:
   SCHEME: TopPresenter
   PRODUCT_NAME: TopPresenter
-  XCODE_VERSION: '16.0'
+  # EXACT parity with the dev Mac: Xcode 26.3 (17C529) on the macos-26 arm64
+  # image. Older Xcode (16.x) silently IGNORES the project's Swift 6.x settings
+  # (SWIFT_DEFAULT_ACTOR_ISOLATION, approachable concurrency) — never build the
+  # release with a different major Xcode than the one used for development.
+  XCODE_VERSION: '26.3'
 
 jobs:
   build:
     name: Build & Package
-    runs-on: macos-15
-    timeout-minutes: 30
+    runs-on: macos-26
+    timeout-minutes: 40
     outputs:
       version: ${{ steps.package.outputs.VERSION }}
       prerelease_tag: ${{ steps.package.outputs.PRERELEASE_TAG }}
       prerelease_version: ${{ steps.package.outputs.PRERELEASE_VERSION }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
 
       - name: Select Xcode
-        run: sudo xcode-select -s /Applications/Xcode_${{ env.XCODE_VERSION }}.app/Contents/Developer
-
-      - name: Show Xcode version
-        run: xcodebuild -version
+        run: |
+          sudo xcode-select -s "/Applications/Xcode_${XCODE_VERSION}.app/Contents/Developer" || {
+            echo "::error::Xcode ${XCODE_VERSION} not on this image. Available:"
+            ls /Applications | grep -i '^Xcode' || true
+            exit 1
+          }
+          xcodebuild -version
 
       - name: Resolve dependencies
         run: xcodebuild -resolvePackageDependencies -scheme "$SCHEME" -project "$PRODUCT_NAME.xcodeproj"
@@ -44,10 +51,8 @@ jobs:
         run: |
           # Monotonic CFBundleVersion so Sparkle can tell releases apart (the project's
           # CURRENT_PROJECT_VERSION is a fixed 1). Ad-hoc code signing ("-") so the app's
-          # entitlements (sandbox + Sparkle XPC) actually apply and the in-app updater's
-          # installer works — no Apple certs needed (Gatekeeper still asks for right-click
-          # → Open, exactly as before). Swap "-" for a Developer ID identity + add
-          # notarization later for silent updates; see UPDATES.md.
+          # entitlements (sandbox + Sparkle XPC) apply with no Apple certs; the bundle is
+          # uniformly RE-signed below so every nested binary carries the same identity.
           xcodebuild \
             -scheme "$SCHEME" \
             -project "$PRODUCT_NAME.xcodeproj" \
@@ -62,18 +67,46 @@ jobs:
             CURRENT_PROJECT_VERSION=${{ github.run_number }} \
             clean build
 
-      - name: Run Unit Tests
+      - name: Run unit tests (gate — failures fail the build)
         run: |
           xcodebuild \
             -scheme "$SCHEME" \
             -project "$PRODUCT_NAME.xcodeproj" \
             -destination 'platform=macOS' \
-            -resultBundlePath TestResults.xcresult \
+            -only-testing:TopPresenterTests \
             CODE_SIGN_IDENTITY="-" \
             CODE_SIGNING_REQUIRED=NO \
             CODE_SIGNING_ALLOWED=NO \
             DEVELOPMENT_TEAM="" \
-            test || true
+            test
+
+      - name: Re-sign uniformly (ad-hoc, inside-out) & verify
+        run: |
+          # DYLD kills the app if the process and a mapped framework carry DIFFERENT
+          # Team IDs ("code signature not valid ... different Team IDs"). Guarantee
+          # uniformity: re-sign every nested Sparkle binary and then the app itself
+          # with the SAME ad-hoc identity, inside-out. No --options runtime here:
+          # hardened runtime + ad-hoc (team-less) signatures = library validation
+          # rejects the frameworks; plain ad-hoc launches everywhere.
+          APP="build/Build/Products/Release/$PRODUCT_NAME.app"
+          SPK="$APP/Contents/Frameworks/Sparkle.framework"
+          for target in \
+            "$SPK/Versions/B/XPCServices/Downloader.xpc" \
+            "$SPK/Versions/B/XPCServices/Installer.xpc" \
+            "$SPK/Versions/B/Autoupdate" \
+            "$SPK/Versions/B/Updater.app" \
+            "$SPK"; do
+            if [ -e "$target" ]; then
+              codesign --force --sign - --preserve-metadata=entitlements "$target"
+            fi
+          done
+          codesign --force --sign - --preserve-metadata=entitlements "$APP"
+          echo "── verify ──"
+          codesign --verify --deep --strict --verbose=2 "$APP"
+          echo "── identities (must ALL be adhoc, no TeamIdentifier) ──"
+          for bin in "$APP" "$SPK" "$SPK/Versions/B/Autoupdate" "$SPK/Versions/B/Updater.app"; do
+            codesign -dv "$bin" 2>&1 | grep -E 'Signature|TeamIdentifier' | sed "s|^|$(basename "$bin"): |"
+          done
 
       - name: Package app
         id: package
@@ -113,7 +146,7 @@ jobs:
             "$GITHUB_WORKSPACE/$PRODUCT_NAME-$VERSION.dmg"
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: TopPresenter-${{ env.VERSION }}
           path: |
@@ -126,7 +159,7 @@ jobs:
     name: Pre-release (Alpha)
     needs: build
     if: github.ref == 'refs/heads/main' && github.event_name == 'push'
-    runs-on: macos-15
+    runs-on: macos-26
     permissions:
       contents: write
       pages: write        # deploy the appcast to Pages (no gh-pages branch)
@@ -139,10 +172,10 @@ jobs:
 
     steps:
       - name: Checkout (for appcast scripts)
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
 
       - name: Download artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
           pattern: TopPresenter-*
           merge-multiple: true
@@ -151,7 +184,7 @@ jobs:
         run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
 
       - name: Create alpha pre-release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
           tag_name: ${{ needs.build.outputs.prerelease_tag }}
           name: "TopPresenter ${{ needs.build.outputs.prerelease_version }}"
@@ -193,24 +226,24 @@ jobs:
 
       - name: Setup Pages
         if: ${{ env.SPARKLE_PRIVATE_KEY != '' }}
-        uses: actions/configure-pages@v5
+        uses: actions/configure-pages@v6
 
       - name: Upload appcast artifact
         if: ${{ env.SPARKLE_PRIVATE_KEY != '' }}
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v5
         with:
           path: site
 
       - name: Deploy appcast to Pages
         if: ${{ env.SPARKLE_PRIVATE_KEY != '' }}
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5
 
   # Stable release on final version tags (v1.0.0, v1.1.0, etc.)
   release:
     name: Stable Release
     needs: build
     if: startsWith(github.ref, 'refs/tags/v') && !contains(github.ref_name, '-')
-    runs-on: macos-15
+    runs-on: macos-26
     permissions:
       contents: write
       pages: write        # deploy the appcast to Pages (no gh-pages branch)
@@ -222,16 +255,16 @@ jobs:
 
     steps:
       - name: Checkout (for appcast scripts)
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
 
       - name: Download artifact
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
           pattern: TopPresenter-*
           merge-multiple: true
 
       - name: Create stable release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
           name: "TopPresenter ${{ github.ref_name }}"
           generate_release_notes: true
@@ -260,14 +293,14 @@ jobs:
 
       - name: Setup Pages
         if: ${{ env.SPARKLE_PRIVATE_KEY != '' }}
-        uses: actions/configure-pages@v5
+        uses: actions/configure-pages@v6
 
       - name: Upload appcast artifact
         if: ${{ env.SPARKLE_PRIVATE_KEY != '' }}
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v5
         with:
           path: site
 
       - name: Deploy appcast to Pages
         if: ${{ env.SPARKLE_PRIVATE_KEY != '' }}
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5

TopPresenter.xcodeproj/project.pbxproj

@@ -441,7 +441,7 @@
 				SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Debug;
 		};
@@ -490,7 +490,7 @@
 				SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 			};
 			name = Release;
 		};
@@ -510,7 +510,7 @@
 				SWIFT_APPROACHABLE_CONCURRENCY = YES;
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TopPresenter.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/TopPresenter";
 			};
 			name = Debug;
@@ -531,7 +531,7 @@
 				SWIFT_APPROACHABLE_CONCURRENCY = YES;
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TopPresenter.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/TopPresenter";
 			};
 			name = Release;
@@ -550,7 +550,7 @@
 				SWIFT_APPROACHABLE_CONCURRENCY = YES;
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TEST_TARGET_NAME = TopPresenter;
 			};
 			name = Debug;
@@ -569,7 +569,7 @@
 				SWIFT_APPROACHABLE_CONCURRENCY = YES;
 				SWIFT_EMIT_LOC_STRINGS = NO;
 				SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TEST_TARGET_NAME = TopPresenter;
 			};
 			name = Release;

TopPresenter/Core/Constants.swift

@@ -8,13 +8,13 @@
 import Foundation
 
 // MARK: - Window Identifiers
-enum WindowIdentifiers {
+nonisolated enum WindowIdentifiers {
     static let main = "main-control"
     static let presentation = "presentation-output"
 }
 
 // MARK: - Supported File Types
-enum SupportedBibleFormat: String, CaseIterable, Identifiable {
+nonisolated enum SupportedBibleFormat: String, CaseIterable, Identifiable {
     case topPresenter = "toppresenter"
     case osisXML = "osis"
     case zefaniaXML = "zefania"
@@ -67,7 +67,7 @@ enum SupportedBibleFormat: String, CaseIterable, Identifiable {
 }
 
 // MARK: - Supported Export Formats
-enum SupportedExportFormat: String, CaseIterable, Identifiable {
+nonisolated enum SupportedExportFormat: String, CaseIterable, Identifiable {
     case topPresenter = "toppresenter"
     case plainText = "plaintext"
     case csv = "csv"
@@ -100,7 +100,7 @@ enum SupportedExportFormat: String, CaseIterable, Identifiable {
 }
 
 // MARK: - USFM Book Abbreviation Mapping
-enum USFMBookIDs {
+nonisolated enum USFMBookIDs {
     static let mapping: [String: (name: String, number: Int)] = [
         "GEN": ("Genesis", 1), "EXO": ("Exodus", 2), "LEV": ("Leviticus", 3),
         "NUM": ("Numbers", 4), "DEU": ("Deuteronomy", 5), "JOS": ("Joshua", 6),
@@ -129,7 +129,7 @@ enum USFMBookIDs {
 }
 
 // MARK: - MySword/Unbound Book Number Mapping
-enum BibleBookNumbers {
+nonisolated enum BibleBookNumbers {
     /// Maps 1-based book number to (name, testament)
     static let mapping: [Int: (name: String, testament: String)] = {
         var map: [Int: (name: String, testament: String)] = [:]
@@ -143,7 +143,7 @@ enum BibleBookNumbers {
     }()
 }
 
-enum SupportedSongFormat: String, CaseIterable, Identifiable {
+nonisolated enum SupportedSongFormat: String, CaseIterable, Identifiable {
     case topPresenterJSON = "toppresenter-song"
     case openSongXML = "opensong"
     case openLyricsXML = "openlyrics"
@@ -177,7 +177,7 @@ enum SupportedSongFormat: String, CaseIterable, Identifiable {
 }
 
 // MARK: - Supported Song Export Formats
-enum SupportedSongExportFormat: String, CaseIterable, Identifiable {
+nonisolated enum SupportedSongExportFormat: String, CaseIterable, Identifiable {
     case topPresenter = "toppresenter"
     case openLyricsXML = "openlyrics"
     case plainText = "plaintext"
@@ -211,7 +211,7 @@ enum SupportedSongExportFormat: String, CaseIterable, Identifiable {
 }
 
 // MARK: - Presentation Defaults
-enum PresentationDefaults {
+nonisolated enum PresentationDefaults {
     static let fontSize: Double = 48.0
     static let minFontSize: Double = 12.0
     static let maxFontSize: Double = 200.0
@@ -225,7 +225,7 @@ enum PresentationDefaults {
 }
 
 // MARK: - Bible Book Names (English canonical order)
-enum BibleBookNames {
+nonisolated enum BibleBookNames {
     static let oldTestament: [String] = [
         "Genesis", "Exodus", "Leviticus", "Numbers", "Deuteronomy",
         "Joshua", "Judges", "Ruth", "1 Samuel", "2 Samuel",
@@ -252,7 +252,7 @@ enum BibleBookNames {
 // MARK: - Bible Book Categories (for color-coding like BibleShow)
 import SwiftUI
 
-enum BibleBookCategory: String, CaseIterable {
+nonisolated enum BibleBookCategory: String, CaseIterable {
     case law            // Genesis–Deuteronomy (1–5)
     case history        // Joshua–Esther (6–17)
     case wisdom         // Job–Song of Solomon (18–22)
@@ -367,7 +367,7 @@ enum BibleBookCategory: String, CaseIterable {
 }
 
 // MARK: - OSIS Book ID Mapping
-enum OSISBookIDs {
+nonisolated enum OSISBookIDs {
     static let mapping: [String: String] = [
         "Gen": "Genesis", "Exod": "Exodus", "Lev": "Leviticus",
         "Num": "Numbers", "Deut": "Deuteronomy", "Josh": "Joshua",

TopPresenter/Core/DataMigration.swift

@@ -9,7 +9,7 @@ import SwiftData
 
 // MARK: - Schema Version 1 (Initial)
 enum SchemaV1: VersionedSchema {
-    static var versionIdentifier = Schema.Version(1, 0, 0)
+    static let versionIdentifier = Schema.Version(1, 0, 0)
 
     static var models: [any PersistentModel.Type] {
         [
@@ -35,7 +35,7 @@ enum SchemaV1: VersionedSchema {
 // defaults — so V1→V2 is a lightweight migration (no data loss, no custom code).
 // SongVerse is retained as the flattened presentation cache of a song's active version.
 enum SchemaV2: VersionedSchema {
-    static var versionIdentifier = Schema.Version(2, 0, 0)
+    static let versionIdentifier = Schema.Version(2, 0, 0)
 
     static var models: [any PersistentModel.Type] {
         [

TopPresenter/Core/PresentationManager.swift

@@ -932,7 +932,8 @@ final class PresentationManager {
         }
     }
 
-    deinit {
+    // isolated deinit (SE-0371): runs on the main actor — may touch isolated state.
+    isolated deinit {
         stopScreenMonitoring()
     }